aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rwxr-xr-xboot.php10
-rw-r--r--include/account.php55
-rw-r--r--include/auth.php12
-rw-r--r--include/follow.php131
-rw-r--r--include/identity.php19
-rwxr-xr-xinclude/items.php68
-rw-r--r--include/menu.php2
-rw-r--r--include/permissions.php21
-rw-r--r--include/photo/photo_driver.php16
-rw-r--r--include/poller.php13
-rwxr-xr-xinclude/text.php42
-rw-r--r--include/zot.php12
-rwxr-xr-xindex.php2
-rw-r--r--library/openid/README49
-rw-r--r--library/openid/example-google.php24
-rw-r--r--library/openid/example.php23
-rw-r--r--library/openid/openid.php (renamed from library/openid.php)268
-rw-r--r--library/openid/provider/example-mysql.php194
-rw-r--r--library/openid/provider/example.php53
-rw-r--r--library/openid/provider/provider.php845
-rw-r--r--mod/admin.php5
-rw-r--r--mod/bookmarks.php4
-rw-r--r--mod/cloud.php4
-rw-r--r--mod/item.php24
-rw-r--r--mod/manage.php5
-rw-r--r--mod/openid.php188
-rw-r--r--mod/rmagic.php58
-rw-r--r--mod/settings.php4
-rw-r--r--mod/siteinfo.php6
-rw-r--r--version.inc2
-rw-r--r--view/css/bootstrap-red.css48
-rw-r--r--view/css/default.css14
-rw-r--r--view/css/mod_mitem.css7
-rw-r--r--view/css/widgets.css3
-rw-r--r--view/de/messages.po2219
-rw-r--r--view/de/strings.php941
-rw-r--r--view/it/messages.po1591
-rw-r--r--view/it/strings.php315
-rw-r--r--view/js/main.js89
-rw-r--r--view/js/mod_settings.js24
-rw-r--r--view/theme/redbasic/css/style.css88
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl4
-rw-r--r--view/tpl/filestorage.tpl7
-rwxr-xr-xview/tpl/head.tpl1
-rw-r--r--view/tpl/mitemlist.tpl5
-rwxr-xr-xview/tpl/nav.tpl311
-rwxr-xr-xview/tpl/settings.tpl4
-rw-r--r--view/tpl/usermenu.tpl3
49 files changed, 4811 insertions, 3024 deletions
diff --git a/README.md b/README.md
index 93dad882b..419793e19 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ The Red Matrix is free and open source distributed under the MIT license.
Please connect with one of the developer channels ("Channel One" would be a good choice) if you are interested in helping us out.
-[Please help us change the world by providing a small donation.](http://pledgie.com/campaigns/18417) (Large donations are also graciously accepted).
+[Please help us change the world by providing a small donation.](http://redmatrix.me/siteinfo) (Large donations are also graciously accepted).
If you would like to become a member of the Red Matrix **right now** , please select a public hub from one of our open providers at [https://zothub.com/pubsites](https://zothub.com/pubsites). All sites are interlinked and you can always move to another, so the choice of site can be somewhat arbitrary. \ No newline at end of file
diff --git a/boot.php b/boot.php
index 41282bb13..1d8ec2143 100755
--- a/boot.php
+++ b/boot.php
@@ -279,6 +279,7 @@ define ( 'PERMS_NETWORK' , 0x0002 );
define ( 'PERMS_SITE' , 0x0004 );
define ( 'PERMS_CONTACTS' , 0x0008 );
define ( 'PERMS_SPECIFIC' , 0x0080 );
+define ( 'PERMS_AUTHED' , 0x0100 );
// Address book flags
@@ -1574,8 +1575,13 @@ function proc_run($cmd){
$args[$x] = escapeshellarg($args[$x]);
$cmdline = implode($args," ");
- if(is_windows())
- proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
+
+
+ if(is_windows()) {
+ $cwd = getcwd();
+ $cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
+ proc_close(proc_open($cmd, array(), $foo));
+ }
else
proc_close(proc_open($cmdline." &",array(),$foo));
}
diff --git a/include/account.php b/include/account.php
index 7d1aa598d..1206223d9 100644
--- a/include/account.php
+++ b/include/account.php
@@ -401,3 +401,58 @@ function user_deny($hash) {
return true;
}
+
+
+/**
+ * @function downgrade_accounts()
+ * Checks for accounts that have past their expiration date.
+ * If the account has a service class which is not the site default,
+ * the service class is reset to the site default and expiration reset to never.
+ * If the account has no service class it is expired and subsequently disabled.
+ * called from include/poller.php as a scheduled task.
+ *
+ * Reclaiming resources which are no longer within the service class limits is
+ * not the job of this function, but this can be implemented by plugin if desired.
+ * Default behaviour is to stop allowing additional resources to be consumed.
+ */
+
+
+function downgrade_accounts() {
+
+ $r = q("select * from account where not ( account_flags & %d )
+ and account_expires != '0000-00-00 00:00:00'
+ and account_expires < UTC_TIMESTAMP() ",
+ intval(ACCOUNT_EXPIRED)
+ );
+
+ if(! $r)
+ return;
+
+ $basic = get_config('system','default_service_class');
+
+
+ foreach($r as $rr) {
+
+ if(($basic) && ($rr['account_service_class']) && ($rr['account_service_class'] != $basic)) {
+ $x = q("UPDATE account set account_service_class = '%s', account_expires = '%s'
+ where account_id = %d limit 1",
+ dbesc($basic),
+ dbesc('0000-00-00 00:00:00'),
+ intval($rr['account_id'])
+ );
+ $ret = array('account' => $rr);
+ call_hooks('account_downgrade', $ret );
+ logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' downgraded.');
+ }
+ else {
+ $x = q("UPDATE account SET account_flags = (account_flags | %d) where account_id = %d limit 1",
+ intval(ACCOUNT_EXPIRED),
+ intval($rr['account_id'])
+ );
+ $ret = array('account' => $rr);
+ call_hooks('account_downgrade', $ret);
+ logger('downgrade_accounts: Account id ' . $rr['account_id'] . ' expired.');
+ }
+ }
+}
+
diff --git a/include/auth.php b/include/auth.php
index 2b7c385fd..a3b028c73 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -93,7 +93,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
}
}
- $r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_hash = '%s' limit 1",
+ $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1",
dbesc($_SESSION['visitor_id'])
);
if($r) {
@@ -230,3 +230,13 @@ else {
authenticate_success($record, true, true);
}
}
+
+
+function match_openid($authid) {
+ $r = q("select * from pconfig where cat = 'system' and k = 'openid' and v = '%s' limit 1",
+ dbesc($authid)
+ );
+ if($r)
+ return $r[0]['uid'];
+ return false;
+}
diff --git a/include/follow.php b/include/follow.php
index 845ce11da..0508a8b37 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -16,6 +16,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$result = array('success' => false,'message' => '');
$a = get_app();
+ $is_red = false;
+
if(! allowed_url($url)) {
$result['message'] = t('Channel is blocked on this site.');
@@ -37,82 +39,94 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$ret = zot_finger($url,$channel);
if($ret['success']) {
+ $is_red = true;
$j = json_decode($ret['body'],true);
}
- else {
- $result['message'] = t('Channel discovery failed. Website may be down or misconfigured.');
- logger('mod_follow: ' . $result['message']);
- return $result;
- }
- logger('follow: ' . $url . ' ' . print_r($j,true));
+ if($is_red && $j) {
- if(! $j) {
- $result['message'] = t('Response from remote channel was not understood.');
- logger('mod_follow: ' . $result['message']);
- return $result;
- }
+ $my_perms = PERMS_W_STREAM|PERMS_W_MAIL;
+ logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG);
- if(! ($j['success'] && $j['guid'])) {
- $result['message'] = t('Response from remote channel was incomplete.');
- logger('mod_follow: ' . $result['message']);
- return $result;
- }
- // Premium channel, set confirm before callback to avoid recursion
+ if(! ($j['success'] && $j['guid'])) {
+ $result['message'] = t('Response from remote channel was incomplete.');
+ logger('mod_follow: ' . $result['message']);
+ return $result;
+ }
- if(array_key_exists('connect_url',$j) && (! $confirm))
- goaway(zid($j['connect_url']));
+ // Premium channel, set confirm before callback to avoid recursion
+ if(array_key_exists('connect_url',$j) && (! $confirm))
+ goaway(zid($j['connect_url']));
- // check service class limits
+ // check service class limits
- $r = q("select count(*) as total from abook where abook_channel = %d and not (abook_flags & %d) ",
- intval($uid),
- intval(ABOOK_FLAG_SELF)
- );
- if($r)
- $total_channels = $r[0]['total'];
+ $r = q("select count(*) as total from abook where abook_channel = %d and not (abook_flags & %d) ",
+ intval($uid),
+ intval(ABOOK_FLAG_SELF)
+ );
+ if($r)
+ $total_channels = $r[0]['total'];
- if(! service_class_allows($uid,'total_channels',$total_channels)) {
- $result['message'] = upgrade_message();
- return $result;
- }
+ if(! service_class_allows($uid,'total_channels',$total_channels)) {
+ $result['message'] = upgrade_message();
+ return $result;
+ }
- // do we have an xchan and hubloc?
- // If not, create them.
+ // do we have an xchan and hubloc?
+ // If not, create them.
- $x = import_xchan($j);
+ $x = import_xchan($j);
- if(! $x['success'])
- return $x;
+ if(! $x['success'])
+ return $x;
- $xchan_hash = $x['hash'];
+ $xchan_hash = $x['hash'];
- $their_perms = 0;
+ $their_perms = 0;
- $global_perms = get_perms();
+ $global_perms = get_perms();
- if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) {
- $permissions = crypto_unencapsulate(array(
- 'data' => $j['permissions']['data'],
- 'key' => $j['permissions']['key'],
- 'iv' => $j['permissions']['iv']),
- $channel['channel_prvkey']);
- if($permissions)
- $permissions = json_decode($permissions,true);
- logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
- }
- else
- $permissions = $j['permissions'];
+ if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) {
+ $permissions = crypto_unencapsulate(array(
+ 'data' => $j['permissions']['data'],
+ 'key' => $j['permissions']['key'],
+ 'iv' => $j['permissions']['iv']),
+ $channel['channel_prvkey']);
+ if($permissions)
+ $permissions = json_decode($permissions,true);
+ logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
+ }
+ else
+ $permissions = $j['permissions'];
- foreach($permissions as $k => $v) {
- if($v) {
- $their_perms = $their_perms | intval($global_perms[$k][1]);
+ foreach($permissions as $k => $v) {
+ if($v) {
+ $their_perms = $their_perms | intval($global_perms[$k][1]);
+ }
}
}
+ else {
+
+ // attempt network auto-discovery
+
+ $my_perms = 0;
+ $their_perms = 0;
+ $xchan_hash = '';
+
+
+
+
+ }
+
+ if(! $xchan_hash) {
+ $result['message'] = t('Channel discovery failed.');
+ logger('follow: ' . $result['message']);
+ return $result;
+ }
if((local_user()) && $uid == local_user()) {
$aid = get_account_id();
@@ -156,7 +170,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
intval($uid),
dbesc($xchan_hash),
intval($their_perms),
- intval(PERMS_W_STREAM|PERMS_W_MAIL),
+ intval($my_perms),
dbesc(datetime_convert()),
dbesc(datetime_convert())
);
@@ -172,7 +186,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
);
if($r) {
$result['abook'] = $r[0];
- proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
+ if($is_red)
+ proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
}
$arr = array('channel_id' => $uid, 'abook' => $result['abook']);
@@ -188,12 +203,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
group_add_member($uid,'',$xchan_hash,$g['id']);
}
- // Then send a ping/message to the other side
-
-
$result['success'] = true;
return $result;
-
-
-
}
diff --git a/include/identity.php b/include/identity.php
index 627e808ea..d83498a69 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -22,8 +22,9 @@ require_once('include/crypto.php');
function identity_check_service_class($account_id) {
$ret = array('success' => false, $message => '');
- $r = q("select count(channel_id) as total from channel where channel_account_id = %d ",
- intval($account_id)
+ $r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d ) ",
+ intval($account_id),
+ intval(PAGE_REMOVED)
);
if(! ($r && count($r))) {
$ret['message'] = t('Unable to obtain identity information from database');
@@ -101,7 +102,7 @@ function get_sys_channel() {
/**
* @channel_total()
- * Return the total number of channels on this site. No filtering is performed.
+ * Return the total number of channels on this site. No filtering is performed except to check PAGE_REMOVED
*
* @returns int
* on error returns boolean false
@@ -109,7 +110,10 @@ function get_sys_channel() {
*/
function channel_total() {
- $r = q("select channel_id from channel where true");
+ $r = q("select channel_id from channel where not ( channel_pageflags & %d )",
+ intval(PAGE_REMOVED)
+ );
+
if(is_array($r))
return count($r);
return false;
@@ -1100,6 +1104,11 @@ function get_theme_uid() {
if(! $uid)
return local_user();
}
+ if(! $uid) {
+ $x = get_sys_channel();
+ if($x)
+ return $x['channel_id'];
+ }
return $uid;
}
@@ -1133,7 +1142,7 @@ function get_default_profile_photo($size = 175) {
*/
function is_foreigner($s) {
- return((strpbrk($s,':@')) ? true : false);
+ return((strpbrk($s,'.:@')) ? true : false);
}
diff --git a/include/items.php b/include/items.php
index 9dc65f89c..7e15e9411 100755
--- a/include/items.php
+++ b/include/items.php
@@ -145,7 +145,9 @@ function can_comment_on_post($observer_xchan,$item) {
* @function red_zrl_callback
* preg_match function when fixing 'naked' links in mod item.php
* Check if we've got a hubloc for the site and use a zrl if we do, a url if we don't.
- *
+ * Remove any existing zid= param which may have been pasted by mistake - and will have
+ * the author's credentials. zid's are dynamic and can't really be passed around like
+ * that.
*/
@@ -159,6 +161,13 @@ function red_zrl_callback($matches) {
if($r)
$zrl = true;
}
+
+ $t = strip_zids($matches[2]);
+ if($t !== $matches[2]) {
+ $zrl = true;
+ $matches[2] = $t;
+ }
+
if($matches[1] === '#^')
$matches[1] = '';
if($zrl)
@@ -716,14 +725,60 @@ function import_author_xchan($x) {
return $arr['xchan_hash'];
if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
- return import_author_zot($x);
+ $y = import_author_zot($x);
}
- // TODO: create xchans for other common and/or aligned networks
+ if($x['network'] === 'rss') {
+ $y = import_author_rss($x);
+ }
+
+ return(($y) ? $y : false);
+}
+
+function import_author_rss($x) {
+
+ if(! $x['url'])
+ return false;
+
+ $r = q("select xchan_hash from xchan where xchan_network = 'rss' and xchan_url = '%s' limit 1",
+ dbesc($x['url'])
+ );
+ if($r) {
+ logger('import_author_rss: in cache' , LOGGER_DEBUG);
+ return $r[0]['xchan_hash'];
+ }
+ $name = trim($x['name']);
+
+ $r = q("insert into xchan ( xchan_hash, xchan_url, xchan_name, xchan_network )
+ values ( '%s', '%s', '%s', '%s' )",
+ dbesc($x['url']),
+ dbesc($x['url']),
+ dbesc(($name) ? $name : t('Unknown')),
+ dbesc('rss')
+ );
+ if($r) {
+
+ $photos = import_profile_photo($x['photo'],$x['url']);
+
+ if($photos) {
+ $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_url = '%s' and xchan_network = 'rss' limit 1",
+ dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
+ dbesc($photos[2]),
+ dbesc($photos[3]),
+ dbesc($x['url'])
+ );
+ if($r)
+ return $x['url'];
+ }
+ }
return false;
+
}
+
function encode_item($item) {
$x = array();
$x['type'] = 'activity';
@@ -2254,6 +2309,13 @@ function tag_deliver($uid,$item_id) {
if(is_array($j_obj['link']))
$taglink = get_rel_link($j_obj['link'],'alternate');
store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j_obj['id']);
+ $x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d limit 1",
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc($j_tgt['id']),
+ intval($u[0]['channel_id'])
+ );
proc_run('php','include/notifier.php','edit_post',$p[0]['id']);
}
}
diff --git a/include/menu.php b/include/menu.php
index e9049bf8e..2f1719d0b 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -38,7 +38,7 @@ function menu_render($menu, $edit = false) {
return replace_macros(get_markup_template('usermenu.tpl'),array(
'$menu' => $menu['menu'],
- '$edit' => $edit,
+ '$edit' => (($edit) ? t("Edit") : ''),
'$items' => $menu['items']
));
}
diff --git a/include/permissions.php b/include/permissions.php
index 420591c54..eb1a7966f 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -88,8 +88,13 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
// These take priority over all other settings.
if($observer_xchan) {
+ if($r[0][$channel_perm] & PERMS_AUTHED) {
+ $ret[$perm_name] = true;
+ continue;
+ }
+
if(! $abook_checked) {
- $x = q("select abook_my_perms, abook_flags from abook
+ $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash
where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
intval($uid),
dbesc($observer_xchan),
@@ -137,9 +142,9 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) {
continue;
}
- // If we're still here, we have an observer, which means they're in the network.
+ // If we're still here, we have an observer, check the network.
- if($r[0][$channel_perm] & PERMS_NETWORK) {
+ if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot')) {
$ret[$perm_name] = true;
continue;
}
@@ -240,7 +245,11 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
return false;
if($observer_xchan) {
- $x = q("select abook_my_perms, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
+ if($r[0][$channel_perm] & PERMS_AUTHED)
+ return true;
+
+ $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash
+ where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1",
intval($uid),
dbesc($observer_xchan),
intval(ABOOK_FLAG_SELF)
@@ -272,9 +281,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) {
return false;
}
- // If we're still here, we have an observer, which means they're in the network.
+ // If we're still here, we have an observer, check the network.
- if($r[0][$channel_perm] & PERMS_NETWORK)
+ if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot'))
return true;
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index c2eeafa54..484550cb7 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -538,14 +538,20 @@ function import_profile_photo($photo,$xchan,$thing = false) {
}
$photo_failure = false;
+ $img_str = '';
+ if($photo) {
+ $filename = basename($photo);
+ $type = guess_image_type($photo,true);
- $filename = basename($photo);
- $type = guess_image_type($photo,true);
- $result = z_fetch_url($photo,true);
+ if(! $type)
+ $type = 'image/jpeg';
- if($result['success'])
- $img_str = $result['body'];
+ $result = z_fetch_url($photo,true);
+
+ if($result['success'])
+ $img_str = $result['body'];
+ }
$img = photo_factory($img_str, $type);
if($img->is_valid()) {
diff --git a/include/poller.php b/include/poller.php
index ce9b75eb3..1c6f68eab 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -32,16 +32,6 @@ function poller_run($argv, $argc){
proc_run('php',"include/queue.php");
- // expire any expired accounts
-
- q("UPDATE account
- SET account_flags = (account_flags | %d)
- where not (account_flags & %d)
- and account_expires != '0000-00-00 00:00:00'
- and account_expires < UTC_TIMESTAMP() ",
- intval(ACCOUNT_EXPIRED),
- intval(ACCOUNT_EXPIRED)
- );
// expire any expired mail
@@ -115,6 +105,9 @@ function poller_run($argv, $argc){
q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY");
+ // expire any expired accounts
+ require_once('include/account.php');
+ downgrade_accounts();
// If this is a directory server, request a sync with an upstream
// directory at least once a day, up to once every poll interval.
diff --git a/include/text.php b/include/text.php
index 2b334068f..dfd35c769 100755
--- a/include/text.php
+++ b/include/text.php
@@ -621,6 +621,11 @@ function get_tags($s) {
}
+function strip_zids($s) {
+ return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
+}
+
+
// quick and dirty quoted_printable encoding
@@ -1319,24 +1324,15 @@ function prepare_text($text,$content_type = 'text/bbcode') {
function zidify_callback($match) {
- if (feature_enabled(local_user(),'sendzid')) {
- $replace = '<a' . $match[1] . ' href="' . zid($match[2]) . '"';
- }
- else {
- $replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';
- }
-
+ $is_zid = ((feature_enabled(local_user(),'sendzid')) || (strpos($match[1],'zrl')) ? true : false);
+ $replace = '<a' . $match[1] . ' href="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
$x = str_replace($match[0],$replace,$match[0]);
return $x;
}
function zidify_img_callback($match) {
- if (feature_enabled(local_user(),'sendzid')) {
- $replace = '<img' . $match[1] . ' src="' . zid($match[2]) . '"';
- }
- else {
- $replace = '<img' . $match[1] . ' src="' . zid($match[2]) . '"';
- }
+ $is_zid = ((feature_enabled(local_user(),'sendzid')) || (strpos($match[1],'zrl')) ? true : false);
+ $replace = '<img' . $match[1] . ' src="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
$x = str_replace($match[0],$replace,$match[0]);
return $x;
@@ -1344,25 +1340,13 @@ function zidify_img_callback($match) {
function zidify_links($s) {
- if(feature_enabled(local_user(),'sendzid')) {
- $s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
- $s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
- }
- else {
- $s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
- $s = preg_replace_callback('/\<img class\=\"zrl\"(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
-// FIXME - remove the following line and redo the regex for the prev line once all Red images are converted to zmg
- $s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
- }
-
+ $s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
+ $s = preg_replace_callback('/\<img(.*?)src\=\"(.*?)\"/ism','zidify_img_callback',$s);
return $s;
}
-
-
-
/**
* return atom link elements for all of our hubs
*/
@@ -1919,3 +1903,7 @@ function in_arrayi($needle, $haystack) {
return in_array(strtolower($needle), array_map('strtolower', $haystack));
}
+function normalise_openid($s) {
+ return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
+}
+
diff --git a/include/zot.php b/include/zot.php
index 21eef073c..c9d426cc2 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1064,7 +1064,9 @@ function zot_import($arr, $sender_url) {
}
stringify_array_elms($recip_arr);
$recips = implode(',',$recip_arr);
- $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) ");
+ $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) ",
+ intval(PAGE_REMOVED)
+ );
if(! $r) {
logger('recips: no recipients on this site');
continue;
@@ -1222,8 +1224,7 @@ function public_recips($msg) {
if(! $r)
$r = array();
- $x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s'
- and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ",
+ $x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ",
dbesc($msg['notify']['sender']['hash'])
);
@@ -1304,8 +1305,9 @@ function allowed_public_recips($msg) {
$condensed_recips[] = $rr['hash'];
$results = array();
- $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' ",
- dbesc($hash)
+ $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d ) ",
+ dbesc($hash),
+ intval(PAGE_REMOVED)
);
if($r) {
foreach($r as $rr)
diff --git a/index.php b/index.php
index 736918661..24d54d829 100755
--- a/index.php
+++ b/index.php
@@ -92,7 +92,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
}
if((x($_GET,'zid')) && (! $a->install)) {
- $a->query_string = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/is','',$a->query_string);
+ $a->query_string = strip_zids($a->query_string);
if(! local_user()) {
$_SESSION['my_address'] = $_GET['zid'];
zid_init($a);
diff --git a/library/openid/README b/library/openid/README
new file mode 100644
index 000000000..799b452ac
--- /dev/null
+++ b/library/openid/README
@@ -0,0 +1,49 @@
+This class provides a simple interface for OpenID (1.1 and 2.0) authentication.
+Supports Yadis discovery.
+
+The authentication process is stateless/dumb.
+
+Usage:
+Sign-on with OpenID is a two step process:
+Step one is authentication with the provider:
+<code>
+$openid = new LightOpenID('my-host.example.org');
+$openid->identity = 'ID supplied by user';
+header('Location: ' . $openid->authUrl());
+</code>
+
+The provider then sends various parameters via GET, one of them is openid_mode.
+Step two is verification:
+<code>
+if ($this->data['openid_mode']) {
+ $openid = new LightOpenID('my-host.example.org');
+ echo $openid->validate() ? 'Logged in.' : 'Failed';
+}
+</code>
+ *
+Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
+for that, unless you know what you are doing.
+ *
+Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
+The default values for those are:
+$openid->realm = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+$openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
+If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
+ *
+AX and SREG extensions are supported.
+To use them, specify $openid->required and/or $openid->optional before calling $openid->authUrl().
+These are arrays, with values being AX schema paths (the 'path' part of the URL).
+For example:
+ $openid->required = array('namePerson/friendly', 'contact/email');
+ $openid->optional = array('namePerson/first');
+If the server supports only SREG or OpenID 1.1, these are automaticaly
+mapped to SREG names, so that user doesn't have to know anything about the server.
+ *
+To get the values, use $openid->getAttributes().
+ *
+The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
+@author Mewp
+@contributors Brice http://github.com/brice/
+@copyright Copyright (c) 2010, Mewp
+@copyright Copyright (c) 2010, Brice
+@license http://www.opensource.org/licenses/mit-license.php MIT \ No newline at end of file
diff --git a/library/openid/example-google.php b/library/openid/example-google.php
new file mode 100644
index 000000000..f23f2cc48
--- /dev/null
+++ b/library/openid/example-google.php
@@ -0,0 +1,24 @@
+<?php
+# Logging in with Google accounts requires setting special identity, so this example shows how to do it.
+require 'openid.php';
+try {
+ # Change 'localhost' to your domain name.
+ $openid = new LightOpenID('localhost');
+ if(!$openid->mode) {
+ if(isset($_GET['login'])) {
+ $openid->identity = 'https://www.google.com/accounts/o8/id';
+ header('Location: ' . $openid->authUrl());
+ }
+?>
+<form action="?login" method="post">
+ <button>Login with Google</button>
+</form>
+<?php
+ } elseif($openid->mode == 'cancel') {
+ echo 'User has canceled authentication!';
+ } else {
+ echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
+ }
+} catch(ErrorException $e) {
+ echo $e->getMessage();
+}
diff --git a/library/openid/example.php b/library/openid/example.php
new file mode 100644
index 000000000..e4ab107fe
--- /dev/null
+++ b/library/openid/example.php
@@ -0,0 +1,23 @@
+<?php
+require 'openid.php';
+try {
+ # Change 'localhost' to your domain name.
+ $openid = new LightOpenID('localhost');
+ if(!$openid->mode) {
+ if(isset($_POST['openid_identifier'])) {
+ $openid->identity = $_POST['openid_identifier'];
+ header('Location: ' . $openid->authUrl());
+ }
+?>
+<form action="" method="post">
+ OpenID: <input type="text" name="openid_identifier" /> <button>Submit</button>
+</form>
+<?php
+ } elseif($openid->mode == 'cancel') {
+ echo 'User has canceled authentication!';
+ } else {
+ echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
+ }
+} catch(ErrorException $e) {
+ echo $e->getMessage();
+}
diff --git a/library/openid.php b/library/openid/openid.php
index 3c58beb8a..00250c59d 100644
--- a/library/openid.php
+++ b/library/openid/openid.php
@@ -8,7 +8,7 @@
* Sign-on with OpenID is a two step process:
* Step one is authentication with the provider:
* <code>
- * $openid = new LightOpenID;
+ * $openid = new LightOpenID('my-host.example.org');
* $openid->identity = 'ID supplied by user';
* header('Location: ' . $openid->authUrl());
* </code>
@@ -16,15 +16,18 @@
* Step two is verification:
* <code>
* if ($this->data['openid_mode']) {
- * $openid = new LightOpenID;
+ * $openid = new LightOpenID('my-host.example.org');
* echo $openid->validate() ? 'Logged in.' : 'Failed';
* }
* </code>
*
+ * Change the 'my-host.example.org' to your domain name. Do NOT use $_SERVER['HTTP_HOST']
+ * for that, unless you know what you are doing.
+ *
* Optionally, you can set $returnUrl and $realm (or $trustRoot, which is an alias).
* The default values for those are:
* $openid->realm = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
- * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI']; # without the query part, if present
+ * $openid->returnUrl = $openid->realm . $_SERVER['REQUEST_URI'];
* If you don't know their meaning, refer to any openid tutorial, or specification. Or just guess.
*
* AX and SREG extensions are supported.
@@ -39,7 +42,7 @@
* To get the values, use $openid->getAttributes().
*
*
- * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled..
+ * The library requires PHP >= 5.1.2 with curl or http/https stream wrappers enabled.
* @author Mewp
* @copyright Copyright (c) 2010, Mewp
* @license http://www.opensource.org/licenses/mit-license.php MIT
@@ -49,11 +52,13 @@ class LightOpenID
public $returnUrl
, $required = array()
, $optional = array()
- , $verify_perr = null
- , $capath = null;
+ , $verify_peer = null
+ , $capath = null
+ , $cainfo = null
+ , $data;
private $identity, $claimed_id;
protected $server, $version, $trustRoot, $aliases, $identifier_select = false
- , $ax = false, $sreg = false, $data;
+ , $ax = false, $sreg = false, $setup_url = null;
static protected $ax_to_sreg = array(
'namePerson/friendly' => 'nickname',
'contact/email' => 'email',
@@ -66,14 +71,28 @@ class LightOpenID
'pref/timezone' => 'timezone',
);
- function __construct()
+ function __construct($host)
{
- $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
- $uri = $_SERVER['REQUEST_URI'];
- $uri = strpos($uri, '?') ? substr($uri, 0, strpos($uri, '?')) : $uri;
+ $this->trustRoot = (strpos($host, '://') ? $host : 'http://' . $host);
+ if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
+ || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
+ && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+ ) {
+ $this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
+ }
+
+ if(($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
+ $this->trustRoot = substr($this->trustRoot, 0, $host_end);
+ }
+
+ $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
$this->returnUrl = $this->trustRoot . $uri;
- $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
+ $this->data = ($_SERVER['REQUEST_METHOD'] === 'POST') ? $_POST : $_GET;
+
+ if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+ throw new ErrorException('You must have either https wrappers or curl enabled.');
+ }
}
function __set($name, $value)
@@ -109,6 +128,8 @@ class LightOpenID
case 'trustRoot':
case 'realm':
return $this->trustRoot;
+ case 'mode':
+ return empty($this->data['openid_mode']) ? null : $this->data['openid_mode'];
}
}
@@ -143,11 +164,15 @@ class LightOpenID
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
- if($this->verify_perr !== null) {
+ if($this->verify_peer !== null) {
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
if($this->capath) {
curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
}
+
+ if($this->cainfo) {
+ curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
+ }
}
if ($method == 'POST') {
@@ -188,7 +213,7 @@ class LightOpenID
protected function request_streams($url, $method='GET', $params=array())
{
if(!$this->hostExists($url)) {
- throw new ErrorException('Invalid request.');
+ throw new ErrorException("Could not connect to $url.", 404);
}
$params = http_build_query($params, '', '&');
@@ -199,7 +224,9 @@ class LightOpenID
'method' => 'GET',
'header' => 'Accept: application/xrds+xml, */*',
'ignore_errors' => true,
- )
+ ), 'ssl' => array(
+ 'CN_match' => parse_url($url, PHP_URL_HOST),
+ ),
);
$url = $url . ($params ? '?' . $params : '');
break;
@@ -210,7 +237,9 @@ class LightOpenID
'header' => 'Content-type: application/x-www-form-urlencoded',
'content' => $params,
'ignore_errors' => true,
- )
+ ), 'ssl' => array(
+ 'CN_match' => parse_url($url, PHP_URL_HOST),
+ ),
);
break;
case 'HEAD':
@@ -219,11 +248,15 @@ class LightOpenID
# we have to change the defaults.
$default = stream_context_get_options(stream_context_get_default());
stream_context_get_default(
- array('http' => array(
- 'method' => 'HEAD',
- 'header' => 'Accept: application/xrds+xml, */*',
- 'ignore_errors' => true,
- ))
+ array(
+ 'http' => array(
+ 'method' => 'HEAD',
+ 'header' => 'Accept: application/xrds+xml, */*',
+ 'ignore_errors' => true,
+ ), 'ssl' => array(
+ 'CN_match' => parse_url($url, PHP_URL_HOST),
+ ),
+ )
);
$url = $url . ($params ? '?' . $params : '');
@@ -263,10 +296,11 @@ class LightOpenID
}
if($this->verify_peer) {
- $opts += array('ssl' => array(
+ $opts['ssl'] += array(
'verify_peer' => true,
'capath' => $this->capath,
- ));
+ 'cafile' => $this->cainfo,
+ );
}
$context = stream_context_create ($opts);
@@ -276,7 +310,9 @@ class LightOpenID
protected function request($url, $method='GET', $params=array())
{
- if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) {
+ if (function_exists('curl_init')
+ && (!in_array('https', stream_get_wrappers()) || !ini_get('safe_mode') && !ini_get('open_basedir'))
+ ) {
return $this->request_curl($url, $method, $params);
}
return $this->request_streams($url, $method, $params);
@@ -297,7 +333,7 @@ class LightOpenID
. (empty($url['port'])?'':":{$url['port']}")
. (empty($url['path'])?'':$url['path'])
. (empty($url['query'])?'':"?{$url['query']}")
- . (empty($url['fragment'])?'':":{$url['fragment']}");
+ . (empty($url['fragment'])?'':"#{$url['fragment']}");
return $url;
}
@@ -342,84 +378,90 @@ class LightOpenID
$headers = $this->request($url, 'HEAD');
$next = false;
- if (isset($headers['x-xrds-location'])) {
- $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location'])));
- $next = true;
- }
+ if (isset($headers['x-xrds-location'])) {
+ $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location'])));
+ $next = true;
+ }
- if (isset($headers['content-type'])
- && ((strpos($headers['content-type'], 'application/xrds+xml') !== false
- ) || (strpos($headers['content-type'], 'text/xml') !== false))) {
- # Found an XRDS document, now let's find the server, and optionally delegate.
- $content = $this->request($url, 'GET');
-
- preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
- foreach($m[1] as $content) {
- $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
-
- # OpenID 2
- $ns = preg_quote('http://specs.openid.net/auth/2.0/');
- if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
- if ($type[1] == 'server') $this->identifier_select = true;
-
- preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
- preg_match('#<(Local|Canonical)ID>(.*)</\1ID>#', $content, $delegate);
- if (empty($server)) {
- return false;
- }
- # Does the server advertise support for either AX or SREG?
- $this->ax = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
- $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
- || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
-
- $server = $server[1];
- if (isset($delegate[2])) $this->identity = trim($delegate[2]);
- $this->version = 2;
-logger('Server: ' . $server);
- $this->server = $server;
- return $server;
+ if (isset($headers['content-type'])
+ && (strpos($headers['content-type'], 'application/xrds+xml') !== false
+ || strpos($headers['content-type'], 'text/xml') !== false)
+ ) {
+ # Apparently, some providers return XRDS documents as text/html.
+ # While it is against the spec, allowing this here shouldn't break
+ # compatibility with anything.
+ # ---
+ # Found an XRDS document, now let's find the server, and optionally delegate.
+ $content = $this->request($url, 'GET');
+
+ preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
+ foreach($m[1] as $content) {
+ $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+
+ # OpenID 2
+ $ns = preg_quote('http://specs.openid.net/auth/2.0/');
+ if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
+ if ($type[1] == 'server') $this->identifier_select = true;
+
+ preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
+ preg_match('#<(Local|Canonical)ID>(.*)</\1ID>#', $content, $delegate);
+ if (empty($server)) {
+ return false;
}
+ # Does the server advertise support for either AX or SREG?
+ $this->ax = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
+ $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
+ || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
- # OpenID 1.1
- $ns = preg_quote('http://openid.net/signon/1.1');
- if (preg_match('#<Type>\s*'.$ns.'\s*</Type>#s', $content)) {
-
- preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
- preg_match('#<.*?Delegate>(.*)</.*?Delegate>#', $content, $delegate);
- if (empty($server)) {
- return false;
- }
- # AX can be used only with OpenID 2.0, so checking only SREG
- $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
- || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
-
- $server = $server[1];
- if (isset($delegate[1])) $this->identity = $delegate[1];
- $this->version = 1;
-
- $this->server = $server;
- return $server;
- }
+ $server = $server[1];
+ if (isset($delegate[2])) $this->identity = trim($delegate[2]);
+ $this->version = 2;
+
+ $this->server = $server;
+ return $server;
}
- $next = true;
- $yadis = false;
- $url = $originalUrl;
- $content = null;
- break;
+ # OpenID 1.1
+ $ns = preg_quote('http://openid.net/signon/1.1');
+ if (preg_match('#<Type>\s*'.$ns.'\s*</Type>#s', $content)) {
+
+ preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
+ preg_match('#<.*?Delegate>(.*)</.*?Delegate>#', $content, $delegate);
+ if (empty($server)) {
+ return false;
+ }
+ # AX can be used only with OpenID 2.0, so checking only SREG
+ $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
+ || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
+
+ $server = $server[1];
+ if (isset($delegate[1])) $this->identity = $delegate[1];
+ $this->version = 1;
+
+ $this->server = $server;
+ return $server;
+ }
}
+
+ $next = true;
+ $yadis = false;
+ $url = $originalUrl;
+ $content = null;
+ break;
+ }
if ($next) continue;
# There are no relevant information in headers, so we search the body.
$content = $this->request($url, 'GET');
- if ($location = $this->htmlTag($content, 'meta', 'http-equiv', 'X-XRDS-Location', 'content')) {
+ $location = $this->htmlTag($content, 'meta', 'http-equiv', 'X-XRDS-Location', 'content');
+ if ($location) {
$url = $this->build_url(parse_url($url), parse_url($location));
continue;
}
}
if (!$content) $content = $this->request($url, 'GET');
-logger('openid' . $content);
+
# At this point, the YADIS Discovery has failed, so we'll switch
# to openid2 HTML discovery, then fallback to openid 1.1 discovery.
$server = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');
@@ -443,9 +485,9 @@ logger('openid' . $content);
return $server;
}
- throw new ErrorException('No servers found!');
+ throw new ErrorException("No OpenID Server found at $url", 404);
}
- throw new ErrorException('Endless redirection!');
+ throw new ErrorException('Endless redirection!', 500);
}
protected function sregParams()
@@ -514,7 +556,7 @@ logger('openid' . $content);
return $params;
}
- protected function authUrl_v1()
+ protected function authUrl_v1($immediate)
{
$returnUrl = $this->returnUrl;
# If we have an openid.delegate that is different from our claimed id,
@@ -526,7 +568,7 @@ logger('openid' . $content);
$params = array(
'openid.return_to' => $returnUrl,
- 'openid.mode' => 'checkid_setup',
+ 'openid.mode' => $immediate ? 'checkid_immediate' : 'checkid_setup',
'openid.identity' => $this->identity,
'openid.trust_root' => $this->trustRoot,
) + $this->sregParams();
@@ -535,11 +577,11 @@ logger('openid' . $content);
, array('query' => http_build_query($params, '', '&')));
}
- protected function authUrl_v2($identifier_select)
+ protected function authUrl_v2($immediate)
{
$params = array(
'openid.ns' => 'http://specs.openid.net/auth/2.0',
- 'openid.mode' => 'checkid_setup',
+ 'openid.mode' => $immediate ? 'checkid_immediate' : 'checkid_setup',
'openid.return_to' => $this->returnUrl,
'openid.realm' => $this->trustRoot,
);
@@ -555,7 +597,7 @@ logger('openid' . $content);
$params += $this->axParams() + $this->sregParams();
}
- if ($identifier_select) {
+ if ($this->identifier_select) {
$params['openid.identity'] = $params['openid.claimed_id']
= 'http://specs.openid.net/auth/2.0/identifier_select';
} else {
@@ -573,17 +615,15 @@ logger('openid' . $content);
* @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
* @throws ErrorException
*/
- function authUrl($identifier_select = null)
+ function authUrl($immediate = false)
{
+ if ($this->setup_url && !$immediate) return $this->setup_url;
if (!$this->server) $this->discover($this->identity);
if ($this->version == 2) {
- if ($identifier_select === null) {
- return $this->authUrl_v2($this->identifier_select);
- }
- return $this->authUrl_v2($identifier_select);
+ return $this->authUrl_v2($immediate);
}
- return $this->authUrl_v1();
+ return $this->authUrl_v1($immediate);
}
/**
@@ -593,6 +633,18 @@ logger('openid' . $content);
*/
function validate()
{
+ # If the request was using immediate mode, a failure may be reported
+ # by presenting user_setup_url (for 1.1) or reporting
+ # mode 'setup_needed' (for 2.0). Also catching all modes other than
+ # id_res, in order to avoid throwing errors.
+ if(isset($this->data['openid_user_setup_url'])) {
+ $this->setup_url = $this->data['openid_user_setup_url'];
+ return false;
+ }
+ if($this->mode != 'id_res') {
+ return false;
+ }
+
$this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
$params = array(
'openid.assoc_handle' => $this->data['openid_assoc_handle'],
@@ -605,7 +657,9 @@ logger('openid' . $content);
# Even though we should know location of the endpoint,
# we still need to verify it by discovery, so $server is not set here
$params['openid.ns'] = 'http://specs.openid.net/auth/2.0';
- } elseif(isset($this->data['openid_claimed_id'])) {
+ } elseif (isset($this->data['openid_claimed_id'])
+ && $this->data['openid_claimed_id'] != $this->data['openid_identity']
+ ) {
# If it's an OpenID 1 provider, and we've got claimed_id,
# we have to append it to the returnUrl, like authUrl_v1 does.
$this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
@@ -665,8 +719,8 @@ logger('openid' . $content);
}
$attributes = array();
- foreach ($this->data as $key => $value) {
- $keyMatch = 'openid_' . $alias . '_value_';
+ foreach (explode(',', $this->data['openid_signed']) as $key) {
+ $keyMatch = $alias . '.value.';
if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
continue;
}
@@ -677,8 +731,10 @@ logger('openid' . $content);
# to check, than cause an E_NOTICE.
continue;
}
+ $value = $this->data['openid_' . $alias . '_value_' . $key];
$key = substr($this->data['openid_' . $alias . '_type_' . $key],
strlen('http://axschema.org/'));
+
$attributes[$key] = $value;
}
return $attributes;
@@ -688,8 +744,8 @@ logger('openid' . $content);
{
$attributes = array();
$sreg_to_ax = array_flip(self::$ax_to_sreg);
- foreach ($this->data as $key => $value) {
- $keyMatch = 'openid_sreg_';
+ foreach (explode(',', $this->data['openid_signed']) as $key) {
+ $keyMatch = 'sreg.';
if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
continue;
}
@@ -698,7 +754,7 @@ logger('openid' . $content);
# The field name isn't part of the SREG spec, so we ignore it.
continue;
}
- $attributes[$sreg_to_ax[$key]] = $value;
+ $attributes[$sreg_to_ax[$key]] = $this->data['openid_sreg_' . $key];
}
return $attributes;
}
diff --git a/library/openid/provider/example-mysql.php b/library/openid/provider/example-mysql.php
new file mode 100644
index 000000000..574e3c811
--- /dev/null
+++ b/library/openid/provider/example-mysql.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * This example shows several things:
+ * - How a setup interface should look like.
+ * - How to use a mysql table for authentication
+ * - How to store associations in mysql table, instead of php sessions.
+ * - How to store realm authorizations.
+ * - How to send AX/SREG parameters.
+ * For the example to work, you need to create the necessary tables:
+CREATE TABLE Users (
+ id INT NOT NULL auto_increment PRIMARY KEY,
+ login VARCHAR(32) NOT NULL,
+ password CHAR(40) NOT NULL,
+ firstName VARCHAR(32) NOT NULL,
+ lastName VARCHAR(32) NOT NULL
+);
+
+CREATE TABLE AllowedSites (
+ user INT NOT NULL,
+ realm TEXT NOT NULL,
+ attributes TEXT NOT NULL,
+ INDEX(user)
+);
+
+CREATE TABLE Associations (
+ id INT NOT NULL PRIMARY KEY,
+ data TEXT NOT NULL
+);
+ *
+ * This is only an example. Don't use it in your code as-is.
+ * It has several security flaws, which you shouldn't copy (like storing plaintext login and password in forms).
+ *
+ * This setup could be very easily flooded with many associations,
+ * since non-private ones aren't automatically deleted.
+ * You could prevent this by storing a date of association and removing old ones,
+ * or by setting $this->dh = false;
+ * However, the latter one would disable stateful mode, unless connecting via HTTPS.
+ */
+require 'provider.php';
+
+mysql_connect();
+mysql_select_db('test');
+
+function getUserData($handle=null)
+{
+ if(isset($_POST['login'],$_POST['password'])) {
+ $login = mysql_real_escape_string($_POST['login']);
+ $password = sha1($_POST['password']);
+ $q = mysql_query("SELECT * FROM Users WHERE login = '$login' AND password = '$password'");
+ if($data = mysql_fetch_assoc($q)) {
+ return $data;
+ }
+ if($handle) {
+ echo 'Wrong login/password.';
+ }
+ }
+ if($handle) {
+ ?>
+ <form action="" method="post">
+ <input type="hidden" name="openid.assoc_handle" value="<?php echo $handle?>">
+ Login: <input type="text" name="login"><br>
+ Password: <input type="password" name="password"><br>
+ <button>Submit</button>
+ </form>
+ <?php
+ die();
+ }
+}
+
+class MysqlProvider extends LightOpenIDProvider
+{
+ private $attrMap = array(
+ 'namePerson/first' => 'First name',
+ 'namePerson/last' => 'Last name',
+ 'namePerson/friendly' => 'Nickname (login)'
+ );
+
+ private $attrFieldMap = array(
+ 'namePerson/first' => 'firstName',
+ 'namePerson/last' => 'lastName',
+ 'namePerson/friendly' => 'login'
+ );
+
+ function setup($identity, $realm, $assoc_handle, $attributes)
+ {
+ $data = getUserData($assoc_handle);
+ echo '<form action="" method="post">'
+ . '<input type="hidden" name="openid.assoc_handle" value="' . $assoc_handle . '">'
+ . '<input type="hidden" name="login" value="' . $_POST['login'] .'">'
+ . '<input type="hidden" name="password" value="' . $_POST['password'] .'">'
+ . "<b>$realm</b> wishes to authenticate you.";
+ if($attributes['required'] || $attributes['optional']) {
+ echo " It also requests following information (required fields marked with *):"
+ . '<ul>';
+
+ foreach($attributes['required'] as $attr) {
+ if(isset($this->attrMap[$attr])) {
+ echo '<li>'
+ . '<input type="checkbox" name="attributes[' . $attr . ']"> '
+ . $this->attrMap[$attr] . '(*)</li>';
+ }
+ }
+
+ foreach($attributes['optional'] as $attr) {
+ if(isset($this->attrMap[$attr])) {
+ echo '<li>'
+ . '<input type="checkbox" name="attributes[' . $attr . ']"> '
+ . $this->attrMap[$attr] . '</li>';
+ }
+ }
+ echo '</ul>';
+ }
+ echo '<br>'
+ . '<button name="once">Allow once</button> '
+ . '<button name="always">Always allow</button> '
+ . '<button name="cancel">cancel</button> '
+ . '</form>';
+ }
+
+ function checkid($realm, &$attributes)
+ {
+ if(isset($_POST['cancel'])) {
+ $this->cancel();
+ }
+
+ $data = getUserData();
+ if(!$data) {
+ return false;
+ }
+ $realm = mysql_real_escape_string($realm);
+ $q = mysql_query("SELECT attributes FROM AllowedSites WHERE user = '{$data['id']}' AND realm = '$realm'");
+
+ $attrs = array();
+ if($attrs = mysql_fetch_row($q)) {
+ $attrs = explode(',', $attributes[0]);
+ } elseif(isset($_POST['attributes'])) {
+ $attrs = array_keys($_POST['attributes']);
+ } elseif(!isset($_POST['once']) && !isset($_POST['always'])) {
+ return false;
+ }
+
+ $attributes = array();
+ foreach($attrs as $attr) {
+ if(isset($this->attrFieldMap[$attr])) {
+ $attributes[$attr] = $data[$this->attrFieldMap[$attr]];
+ }
+ }
+
+ if(isset($_POST['always'])) {
+ $attrs = mysql_real_escape_string(implode(',', array_keys($attributes)));
+ mysql_query("REPLACE INTO AllowedSites VALUES('{$data['id']}', '$realm', '$attrs')");
+ }
+
+ return $this->serverLocation . '?' . $data['login'];
+ }
+
+ function assoc_handle()
+ {
+ # We generate an integer assoc handle, because it's just faster to look up an integer later.
+ $q = mysql_query("SELECT MAX(id) FROM Associations");
+ $result = mysql_fetch_row($q);
+ return $q[0]+1;
+ }
+
+ function setAssoc($handle, $data)
+ {
+ $data = mysql_real_escape_string(serialize($data));
+ mysql_query("REPLACE INTO Associations VALUES('$handle', '$data')");
+ }
+
+ function getAssoc($handle)
+ {
+ if(!is_numeric($handle)) {
+ return false;
+ }
+ $q = mysql_query("SELECT data FROM Associations WHERE id = '$handle'");
+ $data = mysql_fetch_row($q);
+ if(!$data) {
+ return false;
+ }
+ return unserialize($data[0]);
+ }
+
+ function delAssoc($handle)
+ {
+ if(!is_numeric($handle)) {
+ return false;
+ }
+ mysql_query("DELETE FROM Associations WHERE id = '$handle'");
+ }
+
+}
+$op = new MysqlProvider;
+$op->server();
diff --git a/library/openid/provider/example.php b/library/openid/provider/example.php
new file mode 100644
index 000000000..b8a4c24a9
--- /dev/null
+++ b/library/openid/provider/example.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * This example shows how to create a basic provider usin HTTP Authentication.
+ * This is only an example. You shouldn't use it as-is in your code.
+ */
+require 'provider.php';
+
+class BasicProvider extends LightOpenIDProvider
+{
+ public $select_id = true;
+ public $login = '';
+ public $password = '';
+
+ function __construct()
+ {
+ parent::__construct();
+
+ # If we use select_id, we must disable it for identity pages,
+ # so that an RP can discover it and get proper data (i.e. without select_id)
+ if(isset($_GET['id'])) {
+ $this->select_id = false;
+ }
+ }
+
+ function setup($identity, $realm, $assoc_handle, $attributes)
+ {
+ header('WWW-Authenticate: Basic realm="' . $this->data['openid_realm'] . '"');
+ header('HTTP/1.0 401 Unauthorized');
+ }
+
+ function checkid($realm, &$attributes)
+ {
+ if(!isset($_SERVER['PHP_AUTH_USER'])) {
+ return false;
+ }
+
+ if ($_SERVER['PHP_AUTH_USER'] == $this->login
+ && $_SERVER['PHP_AUTH_PW'] == $this->password
+ ) {
+ # Returning identity
+ # It can be any url that leads here, or to any other place that hosts
+ # an XRDS document pointing here.
+ return $this->serverLocation . '?id=' . $this->login;
+ }
+
+ return false;
+ }
+
+}
+$op = new BasicProvider;
+$op->login = 'test';
+$op->password = 'test';
+$op->server();
diff --git a/library/openid/provider/provider.php b/library/openid/provider/provider.php
new file mode 100644
index 000000000..03fbe1c81
--- /dev/null
+++ b/library/openid/provider/provider.php
@@ -0,0 +1,845 @@
+<?php
+/**
+ * Using this class, you can easily set up an OpenID Provider.
+ * It's independent of LightOpenID class.
+ * It requires either GMP or BCMath for session encryption,
+ * but will work without them (although either via SSL, or in stateless mode only).
+ * Also, it requires PHP >= 5.1.2
+ *
+ * This is an alpha version, using it in production code is not recommended,
+ * until you are *sure* that it works and is secure.
+ *
+ * Please send me messages about your testing results
+ * (even if successful, so I know that it has been tested).
+ * Also, if you think there's a way to make it easier to use, tell me -- it's an alpha for a reason.
+ * Same thing applies to bugs in code, suggestions,
+ * and everything else you'd like to say about the library.
+ *
+ * There's no usage documentation here, see the examples.
+ *
+ * @author Mewp
+ * @copyright Copyright (c) 2010, Mewp
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ */
+ini_set('error_log','log');
+abstract class LightOpenIDProvider
+{
+ # URL-s to XRDS and server location.
+ public $xrdsLocation, $serverLocation;
+
+ # Should we operate in server, or signon mode?
+ public $select_id = false;
+
+ # Lifetime of an association.
+ protected $assoc_lifetime = 600;
+
+ # Variables below are either set automatically, or are constant.
+ # -----
+ # Can we support DH?
+ protected $dh = true;
+ protected $ns = 'http://specs.openid.net/auth/2.0';
+ protected $data, $assoc;
+
+ # Default DH parameters as defined in the specification.
+ protected $default_modulus;
+ protected $default_gen = 'Ag==';
+
+ # AX <-> SREG transform
+ protected $ax_to_sreg = array(
+ 'namePerson/friendly' => 'nickname',
+ 'contact/email' => 'email',
+ 'namePerson' => 'fullname',
+ 'birthDate' => 'dob',
+ 'person/gender' => 'gender',
+ 'contact/postalCode/home' => 'postcode',
+ 'contact/country/home' => 'country',
+ 'pref/language' => 'language',
+ 'pref/timezone' => 'timezone',
+ );
+
+ # Math
+ private $add, $mul, $pow, $mod, $div, $powmod;
+ # -----
+
+ # ------------------------------------------------------------------------ #
+ # Functions you probably want to implement when extending the class.
+
+ /**
+ * Checks whether an user is authenticated.
+ * The function should determine what fields it wants to send to the RP,
+ * and put them in the $attributes array.
+ * @param Array $attributes
+ * @param String $realm Realm used for authentication.
+ * @return String OP-local identifier of an authenticated user, or an empty value.
+ */
+ abstract function checkid($realm, &$attributes);
+
+ /**
+ * Displays an user interface for inputting user's login and password.
+ * Attributes are always AX field namespaces, with stripped host part.
+ * For example, the $attributes array may be:
+ * array( 'required' => array('namePerson/friendly', 'contact/email'),
+ * 'optional' => array('pref/timezone', 'pref/language')
+ * @param String $identity Discovered identity string. May be used to extract login, unless using $this->select_id
+ * @param String $realm Realm used for authentication.
+ * @param String Association handle. must be sent as openid.assoc_handle in $_GET or $_POST in subsequent requests.
+ * @param Array User attributes requested by the RP.
+ */
+ abstract function setup($identity, $realm, $assoc_handle, $attributes);
+
+ /**
+ * Stores an association.
+ * If you want to use php sessions in your provider code, you have to replace it.
+ * @param String $handle Association handle -- should be used as a key.
+ * @param Array $assoc Association data.
+ */
+ protected function setAssoc($handle, $assoc)
+ {
+ $oldSession = session_id();
+ session_commit();
+ session_id($assoc['handle']);
+ session_start();
+ $_SESSION['assoc'] = $assoc;
+ session_commit();
+ if($oldSession) {
+ session_id($oldSession);
+ session_start();
+ }
+ }
+
+ /**
+ * Retreives association data.
+ * If you want to use php sessions in your provider code, you have to replace it.
+ * @param String $handle Association handle.
+ * @return Array Association data.
+ */
+ protected function getAssoc($handle)
+ {
+ $oldSession = session_id();
+ session_commit();
+ session_id($handle);
+ session_start();
+ if(empty($_SESSION['assoc'])) {
+ return null;
+ }
+ return $_SESSION['assoc'];
+ session_commit();
+ if($oldSession) {
+ session_id($oldSession);
+ session_start();
+ }
+ }
+
+ /**
+ * Deletes an association.
+ * If you want to use php sessions in your provider code, you have to replace it.
+ * @param String $handle Association handle.
+ */
+ protected function delAssoc($handle)
+ {
+ $oldSession = session_id();
+ session_commit();
+ session_id($handle);
+ session_start();
+ session_destroy();
+ if($oldSession) {
+ session_id($oldSession);
+ session_start();
+ }
+ }
+
+ # ------------------------------------------------------------------------ #
+ # Functions that you might want to implement.
+
+ /**
+ * Redirects the user to an url.
+ * @param String $location The url that the user will be redirected to.
+ */
+ protected function redirect($location)
+ {
+ header('Location: ' . $location);
+ die();
+ }
+
+ /**
+ * Generates a new association handle.
+ * @return string
+ */
+ protected function assoc_handle()
+ {
+ return sha1(microtime());
+ }
+
+ /**
+ * Generates a random shared secret.
+ * @return string
+ */
+ protected function shared_secret($hash)
+ {
+ $length = 20;
+ if($hash == 'sha256') {
+ $length = 256;
+ }
+
+ $secret = '';
+ for($i = 0; $i < $length; $i++) {
+ $secret .= mt_rand(0,255);
+ }
+
+ return $secret;
+ }
+
+ /**
+ * Generates a private key.
+ * @param int $length Length of the key.
+ */
+ protected function keygen($length)
+ {
+ $key = '';
+ for($i = 1; $i < $length; $i++) {
+ $key .= mt_rand(0,9);
+ }
+ $key .= mt_rand(1,9);
+
+ return $key;
+ }
+
+ # ------------------------------------------------------------------------ #
+ # Functions that you probably shouldn't touch.
+
+ function __construct()
+ {
+ $this->default_modulus =
+ 'ANz5OguIOXLsDhmYmsWizjEOHTdxfo2Vcbt2I3MYZuYe91ouJ4mLBX+YkcLiemOcPy'
+ . 'm2CBRYHNOyyjmG0mg3BVd9RcLn5S3IHHoXGHblzqdLFEi/368Ygo79JRnxTkXjgmY0'
+ . 'rxlJ5bU1zIKaSDuKdiI+XUkKJX8Fvf8W8vsixYOr';
+
+ $location = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+ . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $location = preg_replace('/\?.*/','',$location);
+ $this->serverLocation = $location;
+ $location .= (strpos($location, '?') ? '&' : '?') . 'xrds';
+ $this->xrdsLocation = $location;
+
+ $this->data = $_GET + $_POST;
+
+ # We choose GMP if avaiable, and bcmath otherwise
+ if(function_exists('gmp_add')) {
+ $this->add = 'gmp_add';
+ $this->mul = 'gmp_mul';
+ $this->pow = 'gmp_pow';
+ $this->mod = 'gmp_mod';
+ $this->div = 'gmp_div';
+ $this->powmod = 'gmp_powm';
+ } elseif(function_exists('bcadd')) {
+ $this->add = 'bcadd';
+ $this->mul = 'bcmul';
+ $this->pow = 'bcpow';
+ $this->mod = 'bcmod';
+ $this->div = 'bcdiv';
+ $this->powmod = 'bcpowmod';
+ } else {
+ # If neither are avaiable, we can't use DH
+ $this->dh = false;
+ }
+
+ # However, we do require the hash functions.
+ # They should be built-in anyway.
+ if(!function_exists('hash_algos')) {
+ $this->dh = false;
+ }
+ }
+
+ /**
+ * Displays an XRDS document, or redirects to it.
+ * By default, it detects whether it should display or redirect automatically.
+ * @param bool|null $force When true, always display the document, when false always redirect.
+ */
+ function xrds($force=null)
+ {
+ if($force) {
+ echo $this->xrdsContent();
+ die();
+ } elseif($force === false) {
+ header('X-XRDS-Location: '. $this->xrdsLocation);
+ return;
+ }
+
+ if (isset($_GET['xrds'])
+ || (isset($_SERVER['HTTP_ACCEPT']) && strpos($_SERVER['HTTP_ACCEPT'], 'application/xrds+xml') !== false)
+ ) {
+ header('Content-Type: application/xrds+xml');
+ echo $this->xrdsContent();
+ die();
+ }
+
+ header('X-XRDS-Location: ' . $this->xrdsLocation);
+ }
+
+ /**
+ * Returns the content of the XRDS document
+ * @return String The XRDS document.
+ */
+ protected function xrdsContent()
+ {
+ $lines = array(
+ '<?xml version="1.0" encoding="UTF-8"?>',
+ '<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">',
+ '<XRD>',
+ ' <Service>',
+ ' <Type>' . $this->ns . '/' . ($this->select_id ? 'server' : 'signon') .'</Type>',
+ ' <URI>' . $this->serverLocation . '</URI>',
+ ' </Service>',
+ '</XRD>',
+ '</xrds:XRDS>'
+ );
+ return implode("\n", $lines);
+ }
+
+ /**
+ * Does everything that a provider has to -- in one function.
+ */
+ function server()
+ {
+ if(isset($this->data['openid_assoc_handle'])) {
+ $this->assoc = $this->getAssoc($this->data['openid_assoc_handle']);
+ if(isset($this->assoc['data'])) {
+ # We have additional data stored for setup.
+ $this->data += $this->assoc['data'];
+ unset($this->assoc['data']);
+ }
+ }
+
+ if (isset($this->data['openid_ns'])
+ && $this->data['openid_ns'] == $this->ns
+ ) {
+ if(!isset($this->data['openid_mode'])) $this->errorResponse();
+
+ switch($this->data['openid_mode'])
+ {
+ case 'checkid_immediate':
+ case 'checkid_setup':
+ $this->checkRealm();
+ # We support AX xor SREG.
+ $attributes = $this->ax();
+ if(!$attributes) {
+ $attributes = $this->sreg();
+ }
+
+ # Even if some user is authenticated, we need to know if it's
+ # the same one that want's to authenticate.
+ # Of course, if we use select_id, we accept any user.
+ if (($identity = $this->checkid($this->data['openid_realm'], $attrValues))
+ && ($this->select_id || $identity == $this->data['openid_identity'])
+ ) {
+ $this->positiveResponse($identity, $attrValues);
+ } elseif($this->data['openid_mode'] == 'checkid_immediate') {
+ $this->redirect($this->response(array('openid.mode' => 'setup_needed')));
+ } else {
+ if(!$this->assoc) {
+ $this->generateAssociation();
+ $this->assoc['private'] = true;
+ }
+ $this->assoc['data'] = $this->data;
+ $this->setAssoc($this->assoc['handle'], $this->assoc);
+ $this->setup($this->data['openid_identity'],
+ $this->data['openid_realm'],
+ $this->assoc['handle'],
+ $attributes);
+ }
+ break;
+ case 'associate':
+ $this->associate();
+ break;
+ case 'check_authentication':
+ $this->checkRealm();
+ if($this->verify()) {
+ echo "ns:$this->ns\nis_valid:true";
+ if(strpos($this->data['openid_signed'],'invalidate_handle') !== false) {
+ echo "\ninvalidate_handle:" . $this->data['openid_invalidate_handle'];
+ }
+ } else {
+ echo "ns:$this->ns\nis_valid:false";
+ }
+ die();
+ break;
+ default:
+ $this->errorResponse();
+ }
+ } else {
+ $this->xrds();
+ }
+ }
+
+ protected function checkRealm()
+ {
+ if (!isset($this->data['openid_return_to'], $this->data['openid_realm'])) {
+ $this->errorResponse();
+ }
+
+ $realm = str_replace('\*', '[^/]', preg_quote($this->data['openid_realm']));
+ if(!preg_match("#^$realm#", $this->data['openid_return_to'])) {
+ $this->errorResponse();
+ }
+ }
+
+ protected function ax()
+ {
+ # Namespace prefix that the fields must have.
+ $ns = 'http://axschema.org/';
+
+ # First, we must find out what alias is used for AX.
+ # Let's check the most likely one
+ $alias = null;
+ if (isset($this->data['openid_ns_ax'])
+ && $this->data['openid_ns_ax'] == 'http://openid.net/srv/ax/1.0'
+ ) {
+ $alias = 'ax';
+ } else {
+ foreach($this->data as $name => $value) {
+ if ($value == 'http://openid.net/srv/ax/1.0'
+ && preg_match('/openid_ns_(.+)/', $name, $m)
+ ) {
+ $alias = $m[1];
+ break;
+ }
+ }
+ }
+
+ if(!$alias) {
+ return null;
+ }
+
+ $fields = array();
+ # Now, we must search again, this time for field aliases
+ foreach($this->data as $name => $value) {
+ if (strpos($name, 'openid_' . $alias . '_type') === false
+ || strpos($value, $ns) === false) {
+ continue;
+ }
+
+ $name = substr($name, strlen('openid_' . $alias . '_type_'));
+ $value = substr($value, strlen($ns));
+
+ $fields[$name] = $value;
+ }
+
+ # Then, we find out what fields are required and optional
+ $required = array();
+ $if_available = array();
+ foreach(array('required','if_available') as $type) {
+ if(empty($this->data["openid_{$alias}_{$type}"])) {
+ continue;
+ }
+ $attributes = explode(',', $this->data["openid_{$alias}_{$type}"]);
+ foreach($attributes as $attr) {
+ if(empty($fields[$attr])) {
+ # There is an undefined field here, so we ignore it.
+ continue;
+ }
+
+ ${$type}[] = $fields[$attr];
+ }
+ }
+
+ $this->data['ax'] = true;
+ return array('required' => $required, 'optional' => $if_available);
+ }
+
+ protected function sreg()
+ {
+ $sreg_to_ax = array_flip($this->ax_to_sreg);
+
+ $attributes = array('required' => array(), 'optional' => array());
+
+ if (empty($this->data['openid_sreg_required'])
+ && empty($this->data['openid_sreg_optional'])
+ ) {
+ return $attributes;
+ }
+
+ foreach(array('required', 'optional') as $type) {
+ foreach(explode(',',$this->data['openid_sreg_' . $type]) as $attr) {
+ if(empty($sreg_to_ax[$attr])) {
+ # Undefined attribute in SREG request.
+ # Shouldn't happen, but we check anyway.
+ continue;
+ }
+
+ $attributes[$type][] = $sreg_to_ax[$attr];
+ }
+ }
+
+ return $attributes;
+ }
+
+ /**
+ * Aids an RP in assertion verification.
+ * @return bool Information whether the verification suceeded.
+ */
+ protected function verify()
+ {
+ # Firstly, we need to make sure that there's an association.
+ # Otherwise the verification will fail,
+ # because we've signed assoc_handle in the assertion
+ if(empty($this->assoc)) {
+ return false;
+ }
+
+ # Next, we check that it's a private association,
+ # i.e. one made without RP input.
+ # Otherwise, the RP shouldn't ask us to verify.
+ if(empty($this->assoc['private'])) {
+ return false;
+ }
+
+ # Now we have to check if the nonce is correct, to prevent replay attacks.
+ if($this->data['openid_response_nonce'] != $this->assoc['nonce']) {
+ return false;
+ }
+
+ # Getting the signed fields for signature.
+ $sig = array();
+ $signed = explode(',', $this->data['openid_signed']);
+ foreach($signed as $field) {
+ $name = strtr($field, '.', '_');
+ if(!isset($this->data['openid_' . $name])) {
+ return false;
+ }
+
+ $sig[$field] = $this->data['openid_' . $name];
+ }
+
+ # Computing the signature and checking if it matches.
+ $sig = $this->keyValueForm($sig);
+ if ($this->data['openid_sig'] !=
+ base64_encode(hash_hmac($this->assoc['hash'], $sig, $this->assoc['mac'], true))
+ ) {
+ return false;
+ }
+
+ # Clearing the nonce, so that it won't be used again.
+ $this->assoc['nonce'] = null;
+
+ if(empty($this->assoc['private'])) {
+ # Commiting changes to the association.
+ $this->setAssoc($this->assoc['handle'], $this->assoc);
+ } else {
+ # Private associations shouldn't be used again, se we can as well delete them.
+ $this->delAssoc($this->assoc['handle']);
+ }
+
+ # Nothing has failed, so the verification was a success.
+ return true;
+ }
+
+ /**
+ * Performs association with an RP.
+ */
+ protected function associate()
+ {
+ # Rejecting no-encryption without TLS.
+ if(empty($_SERVER['HTTPS']) && $this->data['openid_session_type'] == 'no-encryption') {
+ $this->directErrorResponse();
+ }
+
+ # Checking whether we support DH at all.
+ if (!$this->dh && substr($this->data['openid_session_type'], 0, 2) == 'DH') {
+ $this->redirect($this->response(array(
+ 'openid.error' => 'DH not supported',
+ 'openid.error_code' => 'unsupported-type',
+ 'openid.session_type' => 'no-encryption'
+ )));
+ }
+
+ # Creating the association
+ $this->assoc = array();
+ $this->assoc['hash'] = $this->data['openid_assoc_type'] == 'HMAC-SHA256' ? 'sha256' : 'sha1';
+ $this->assoc['handle'] = $this->assoc_handle();
+
+ # Getting the shared secret
+ if($this->data['openid_session_type'] == 'no-encryption') {
+ $this->assoc['mac'] = base64_encode($this->shared_secret($this->assoc['hash']));
+ } else {
+ $this->dh();
+ }
+
+ # Preparing the direct response...
+ $response = array(
+ 'ns' => $this->ns,
+ 'assoc_handle' => $this->assoc['handle'],
+ 'assoc_type' => $this->data['openid_assoc_type'],
+ 'session_type' => $this->data['openid_session_type'],
+ 'expires_in' => $this->assoc_lifetime
+ );
+
+ if(isset($this->assoc['dh_server_public'])) {
+ $response['dh_server_public'] = $this->assoc['dh_server_public'];
+ $response['enc_mac_key'] = $this->assoc['mac'];
+ } else {
+ $response['mac_key'] = $this->assoc['mac'];
+ }
+
+ # ...and sending it.
+ echo $this->keyValueForm($response);
+ die();
+ }
+
+ /**
+ * Creates a private association.
+ */
+ protected function generateAssociation()
+ {
+ $this->assoc = array();
+ # We use sha1 by default.
+ $this->assoc['hash'] = 'sha1';
+ $this->assoc['mac'] = $this->shared_secret('sha1');
+ $this->assoc['handle'] = $this->assoc_handle();
+ }
+
+ /**
+ * Encrypts the MAC key using DH key exchange.
+ */
+ protected function dh()
+ {
+ if(empty($this->data['openid_dh_modulus'])) {
+ $this->data['openid_dh_modulus'] = $this->default_modulus;
+ }
+
+ if(empty($this->data['openid_dh_gen'])) {
+ $this->data['openid_dh_gen'] = $this->default_gen;
+ }
+
+ if(empty($this->data['openid_dh_consumer_public'])) {
+ $this->directErrorResponse();
+ }
+
+ $modulus = $this->b64dec($this->data['openid_dh_modulus']);
+ $gen = $this->b64dec($this->data['openid_dh_gen']);
+ $consumerKey = $this->b64dec($this->data['openid_dh_consumer_public']);
+
+ $privateKey = $this->keygen(strlen($modulus));
+ $publicKey = $this->powmod($gen, $privateKey, $modulus);
+ $ss = $this->powmod($consumerKey, $privateKey, $modulus);
+
+ $mac = $this->x_or(hash($this->assoc['hash'], $ss, true), $this->shared_secret($this->assoc['hash']));
+ $this->assoc['dh_server_public'] = $this->decb64($publicKey);
+ $this->assoc['mac'] = base64_encode($mac);
+ }
+
+ /**
+ * XORs two strings.
+ * @param String $a
+ * @param String $b
+ * @return String $a ^ $b
+ */
+ protected function x_or($a, $b)
+ {
+ $length = strlen($a);
+ for($i = 0; $i < $length; $i++) {
+ $a[$i] = $a[$i] ^ $b[$i];
+ }
+
+ return $a;
+ }
+
+ /**
+ * Prepares an indirect response url.
+ * @param array $params Parameters to be sent.
+ */
+ protected function response($params)
+ {
+ $params += array('openid.ns' => $this->ns);
+ return $this->data['openid_return_to']
+ . (strpos($this->data['openid_return_to'],'?') ? '&' : '?')
+ . http_build_query($params, '', '&');
+ }
+
+ /**
+ * Outputs a direct error.
+ */
+ protected function errorResponse()
+ {
+ if(!empty($this->data['openid_return_to'])) {
+ $response = array(
+ 'openid.mode' => 'error',
+ 'openid.error' => 'Invalid request'
+ );
+ $this->redirect($this->response($response));
+ } else {
+ header('HTTP/1.1 400 Bad Request');
+ $response = array(
+ 'ns' => $this->ns,
+ 'error' => 'Invalid request'
+ );
+ echo $this->keyValueForm($response);
+ }
+ die();
+ }
+
+ /**
+ * Sends an positive assertion.
+ * @param String $identity the OP-Local Identifier that is being authenticated.
+ * @param Array $attributes User attributes to be sent.
+ */
+ protected function positiveResponse($identity, $attributes)
+ {
+ # We generate a private association if there is none established.
+ if(!$this->assoc) {
+ $this->generateAssociation();
+ $this->assoc['private'] = true;
+ }
+
+ # We set openid.identity (and openid.claimed_id if necessary) to our $identity
+ if($this->data['openid_identity'] == $this->data['openid_claimed_id'] || $this->select_id) {
+ $this->data['openid_claimed_id'] = $identity;
+ }
+ $this->data['openid_identity'] = $identity;
+
+ # Preparing fields to be signed
+ $params = array(
+ 'op_endpoint' => $this->serverLocation,
+ 'claimed_id' => $this->data['openid_claimed_id'],
+ 'identity' => $this->data['openid_identity'],
+ 'return_to' => $this->data['openid_return_to'],
+ 'realm' => $this->data['openid_realm'],
+ 'response_nonce' => gmdate("Y-m-d\TH:i:s\Z"),
+ 'assoc_handle' => $this->assoc['handle'],
+ );
+
+ $params += $this->responseAttributes($attributes);
+
+ # Has the RP used an invalid association handle?
+ if (isset($this->data['openid_assoc_handle'])
+ && $this->data['openid_assoc_handle'] != $this->assoc['handle']
+ ) {
+ $params['invalidate_handle'] = $this->data['openid_assoc_handle'];
+ }
+
+ # Signing the $params
+ $sig = hash_hmac($this->assoc['hash'], $this->keyValueForm($params), $this->assoc['mac'], true);
+ $req = array(
+ 'openid.mode' => 'id_res',
+ 'openid.signed' => implode(',', array_keys($params)),
+ 'openid.sig' => base64_encode($sig),
+ );
+
+ # Saving the nonce and commiting the association.
+ $this->assoc['nonce'] = $params['response_nonce'];
+ $this->setAssoc($this->assoc['handle'], $this->assoc);
+
+ # Preparing and sending the response itself
+ foreach($params as $name => $value) {
+ $req['openid.' . $name] = $value;
+ }
+
+ $this->redirect($this->response($req));
+ }
+
+ /**
+ * Prepares an array of attributes to send
+ */
+ protected function responseAttributes($attributes)
+ {
+ if(!$attributes) return array();
+
+ $ns = 'http://axschema.org/';
+
+ $response = array();
+ if(isset($this->data['ax'])) {
+ $response['ns.ax'] = 'http://openid.net/srv/ax/1.0';
+ foreach($attributes as $name => $value) {
+ $alias = strtr($name, '/', '_');
+ $response['ax.type.' . $alias] = $ns . $name;
+ $response['ax.value.' . $alias] = $value;
+ }
+ return $response;
+ }
+
+ foreach($attributes as $name => $value) {
+ if(!isset($this->ax_to_sreg[$name])) {
+ continue;
+ }
+
+ $response['sreg.' . $this->ax_to_sreg[$name]] = $value;
+ }
+ return $response;
+ }
+
+ /**
+ * Encodes fields in key-value form.
+ * @param Array $params Fields to be encoded.
+ * @return String $params in key-value form.
+ */
+ protected function keyValueForm($params)
+ {
+ $str = '';
+ foreach($params as $name => $value) {
+ $str .= "$name:$value\n";
+ }
+
+ return $str;
+ }
+
+ /**
+ * Responds with an information that the user has canceled authentication.
+ */
+ protected function cancel()
+ {
+ $this->redirect($this->response(array('openid.mode' => 'cancel')));
+ }
+
+ /**
+ * Converts base64 encoded number to it's decimal representation.
+ * @param String $str base64 encoded number.
+ * @return String Decimal representation of that number.
+ */
+ protected function b64dec($str)
+ {
+ $bytes = unpack('C*', base64_decode($str));
+ $n = 0;
+ foreach($bytes as $byte) {
+ $n = $this->add($this->mul($n, 256), $byte);
+ }
+
+ return $n;
+ }
+
+ /**
+ * Complements b64dec.
+ */
+ protected function decb64($num)
+ {
+ $bytes = array();
+ while($num) {
+ array_unshift($bytes, $this->mod($num, 256));
+ $num = $this->div($num, 256);
+ }
+
+ if($bytes && $bytes[0] > 127) {
+ array_unshift($bytes,0);
+ }
+
+ array_unshift($bytes, 'C*');
+
+ return base64_encode(call_user_func_array('pack', $bytes));
+ }
+
+ function __call($name, $args)
+ {
+ switch($name) {
+ case 'add':
+ case 'mul':
+ case 'pow':
+ case 'mod':
+ case 'div':
+ case 'powmod':
+ if(function_exists('gmp_strval')) {
+ return gmp_strval(call_user_func_array($this->$name, $args));
+ }
+ return call_user_func_array($this->$name, $args);
+ default:
+ throw new BadMethodCallException();
+ }
+ }
+}
diff --git a/mod/admin.php b/mod/admin.php
index 01296bd29..c4a284941 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -706,9 +706,10 @@ function admin_page_users(&$a){
$users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " .
"(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " .
- "WHERE ch.channel_account_id = ac.account_id) as `channels` " .
+ "WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " .
"FROM account as ac where true $serviceclass $order limit %d , %d ",
- intval(ACCOUNT_BLOCKED),
+ intval(ACCOUNT_BLOCKED),
+ intval(PAGE_REMOVED),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 67208937d..c5be68b8e 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -57,7 +57,7 @@ function bookmarks_content(&$a) {
if($x) {
foreach($x as $xx) {
$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
- $o .= menu_render($y);
+ $o .= menu_render($y,true);
}
}
@@ -69,7 +69,7 @@ function bookmarks_content(&$a) {
if($x) {
foreach($x as $xx) {
$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
- $o .= menu_render($y);
+ $o .= menu_render($y,true);
}
}
diff --git a/mod/cloud.php b/mod/cloud.php
index 18b61f941..3606325bd 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -73,11 +73,11 @@ function cloud_init(&$a) {
$_SERVER['QUERY_STRING'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['QUERY_STRING']);
- $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']);
+ $_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']);
$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['QUERY_STRING']);
$_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']);
- $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
+ $_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
$rootDirectory = new RedDirectory('/',$auth);
diff --git a/mod/item.php b/mod/item.php
index 48f85f692..dc005bb20 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -423,19 +423,13 @@ function item_post(&$a) {
/**
* fix naked links by passing through a callback to see if this is a red site
* (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both.
- * First wrap any url which is part of link anchor text already in quotes so we don't double link it.
- * e.g. [url=http://foobar.com]something with http://elsewhere.com in it[/url]
- * becomes [url=http://foobar.com]something with "http://elsewhere.com" in it[/url]
- * otherwise http://elsewhere.com becomes #^[url=http://elsewhere.com]http://elsewhere.com[/url]
+ * First protect any url inside certain bbcode tags so we don't double link it.
*/
$body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','red_escape_codeblock',$body);
$body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','red_escape_codeblock',$body);
$body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','red_escape_codeblock',$body);
-// no longer needed
-// $body = preg_replace_callback('/\[([uz])rl(.*?)\](.*?)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)(.*?)\[\/([uz])rl\]/ism','red_escape_zrl_callback',$body);
-
$body = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body);
$body = preg_replace_callback('/\[\$b64zrl(.*?)\[\/(zrl)\]/ism','red_unescape_codeblock',$body);
@@ -459,6 +453,16 @@ function item_post(&$a) {
* the post and we should keep it private. If it's encrypted we have no way of knowing
* so we'll set the permissions regardless and realise that the media may not be
* referenced in the post.
+ *
+ * What is preventing us from being able to upload photos into comments is dealing with
+ * the photo and attachment permissions, since we don't always know who was in the
+ * distribution for the top level post.
+ *
+ * We might be able to provide this functionality with a lot of fiddling:
+ * - if the top level post is public (make the photo public)
+ * - if the top level post was written by us or a wall post that belongs to us (match the top level post)
+ * - if the top level post has privacy mentions, add those to the permissions.
+ * - otherwise disallow the photo *or* make the photo public. This is the part that gets messy.
*/
if(! $preview) {
@@ -495,6 +499,7 @@ function item_post(&$a) {
$private_forum = false;
if(count($tags)) {
+ $first_access_tag = true;
foreach($tags as $tag) {
// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
@@ -514,6 +519,11 @@ function item_post(&$a) {
logger('handle_tag: ' . print_r($success,tue), LOGGER_DEBUG);
if(($access_tag) && (! $parent_item)) {
logger('access_tag: ' . $tag . ' ' . print_r($access_tag,true), LOGGER_DEBUG);
+ if ($first_access_tag) {
+ $str_contact_allow = '';
+ $str_group_allow = '';
+ $first_access_tag = false;
+ }
if(strpos($access_tag,'cid:') === 0) {
$str_contact_allow .= '<' . substr($access_tag,4) . '>';
$access_tag = '';
diff --git a/mod/manage.php b/mod/manage.php
index a2f65b271..0772e2d61 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -55,8 +55,9 @@ function manage_content(&$a) {
}
}
- $r = q("select count(channel_id) as total from channel where channel_account_id = %d ",
- intval(get_account_id())
+ $r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d )",
+ intval(get_account_id()),
+ intval(PAGE_REMOVED)
);
$limit = service_class_fetch(local_user(),'total_identities');
if($limit !== false) {
diff --git a/mod/openid.php b/mod/openid.php
new file mode 100644
index 000000000..1ab8749ee
--- /dev/null
+++ b/mod/openid.php
@@ -0,0 +1,188 @@
+<?php
+
+
+require_once('library/openid/openid.php');
+require_once('include/auth.php');
+
+function openid_content(&$a) {
+
+ $noid = get_config('system','disable_openid');
+ if($noid)
+ goaway(z_root());
+
+ logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
+
+ if(x($_REQUEST,'openid_mode')) {
+
+ $openid = new LightOpenID(z_root());
+
+ if($openid->validate()) {
+
+ logger('openid: validate');
+
+ $authid = normalise_openid($_REQUEST['openid_identity']);
+
+ if(! strlen($authid)) {
+ logger( t('OpenID protocol error. No ID returned.') . EOL);
+ goaway(z_root());
+ }
+
+ $x = match_openid($authid);
+ if($x) {
+
+ $r = q("select * from channel where channel_id = %d limit 1",
+ intval($x)
+ );
+ if($r) {
+ $y = q("select * from account where account_id = %d limit 1",
+ intval($r[0]['channel_account_id'])
+ );
+ if($y) {
+ foreach($y as $record) {
+ if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
+ logger('mod_openid: openid success for ' . $x[0]['channel_name']);
+ $_SESSION['uid'] = $r[0]['channel_id'];
+ $_SESSION['authenticated'] = true;
+ authenticate_success($record,true,true,true,true);
+ goaway(z_root());
+ }
+ }
+ }
+ }
+ }
+
+ // Successful OpenID login - but we can't match it to an existing account.
+ // See if they've got an xchan
+
+ $r = q("select * from xconfig left join xchan on xchan_hash = xconfig.xchan where cat = 'system' and k = 'openid' and v = '%s' limit 1",
+ dbesc($authid)
+ );
+
+ if($r) {
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+ $_SESSION['my_address'] = $r[0]['xchan_addr'];
+ $arr = array('xchan' => $r[0], 'session' => $_SESSION);
+ call_hooks('magic_auth_openid_success',$arr);
+ $a->set_observer($r[0]);
+ require_once('include/security.php');
+ $a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
+ info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+ logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']);
+ if($_SESSION['return_url'])
+ goaway($_SESSION['return_url']);
+ goaway(z_root());
+ }
+
+ // no xchan...
+ // create one.
+ // We should probably probe the openid url and figure out if they have any kind of social presence we might be able to
+ // scrape some identifying info from.
+
+ $name = $authid;
+ $url = trim($_REQUEST['openid_identity'],'/');
+ if(strpos($url,'http') === false)
+ $url = 'https://' . $url;
+ $pphoto = get_default_profile_photo();
+ $parsed = @parse_url($url);
+ if($parsed) {
+ $host = $parsed['host'];
+ }
+
+ $attr = $openid->getAttributes();
+
+ if(is_array($attr) && count($attr)) {
+ foreach($attr as $k => $v) {
+ if($k === 'namePerson/friendly')
+ $nick = notags(trim($v));
+ if($k === 'namePerson/first')
+ $first = notags(trim($v));
+ if($k === 'namePerson')
+ $name = notags(trim($v));
+ if($k === 'contact/email')
+ $addr = notags(trim($v));
+ if($k === 'media/image/aspect11')
+ $photosq = trim($v);
+ if($k === 'media/image/default')
+ $photo_other = trim($v);
+ }
+ }
+ if(! $nick) {
+ if($first)
+ $nick = $first;
+ else
+ $nick = $name;
+ }
+
+ require_once('library/urlify/URLify.php');
+ $x = strtolower(URLify::transliterate($nick));
+ if($nick & $host)
+ $addr = $nick . '@' . $host;
+ $network = 'unknown';
+
+ if($photosq)
+ $pphoto = $photosq;
+ elseif($photo_other)
+ $pphoto = $photo_other;
+
+ $x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
+ xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date,
+ xchan_name_date, xchan_flags)
+ values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ",
+ dbesc($url),
+ dbesc(''),
+ dbesc(''),
+ dbesc(''),
+ dbesc('image/jpeg'),
+ dbesc($pphoto),
+ dbesc($addr),
+ dbesc($url),
+ dbesc(''),
+ dbesc(''),
+ dbesc(''),
+ dbesc($name),
+ dbesc($network),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval(XCHAN_FLAGS_HIDDEN)
+ );
+ if($x) {
+ $r = q("select * from xchan where xchan_hash = '%s' limit 1",
+ dbesc($url)
+ );
+ if($r) {
+
+ $photos = import_profile_photo($pphoto,$url);
+ if($photos) {
+ $z = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s',
+ xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1",
+ dbesc(datetime_convert()),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
+ dbesc($photos[2]),
+ dbesc($photos[3]),
+ dbesc($url)
+ );
+ }
+
+ set_xconfig($url,'system','openid',$authid);
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['visitor_id'] = $r[0]['xchan_hash'];
+ $_SESSION['my_address'] = $r[0]['xchan_addr'];
+ $arr = array('xchan' => $r[0], 'session' => $_SESSION);
+ call_hooks('magic_auth_openid_success',$arr);
+ $a->set_observer($r[0]);
+ info(sprintf( t('Welcome %s. Remote authentication successful.'),$r[0]['xchan_name']));
+ logger('mod_openid: remote auth success from ' . $r[0]['xchan_addr']);
+ if($_SESSION['return_url'])
+ goaway($_SESSION['return_url']);
+ goaway(z_root());
+ }
+ }
+
+ }
+ }
+ notice( t('Login failed.') . EOL);
+ goaway(z_root());
+ // NOTREACHED
+}
diff --git a/mod/rmagic.php b/mod/rmagic.php
index b8c1c6553..946277327 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -22,31 +22,53 @@ function rmagic_init(&$a) {
function rmagic_post(&$a) {
- $address = $_REQUEST['address'];
+ $address = trim($_REQUEST['address']);
+
if(strpos($address,'@') === false) {
- notice('Invalid address.');
- return;
- }
+ $arr = array('address' => $address);
+ call_hooks('reverse_magic_auth', $arr);
- $r = null;
- if($address) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
- dbesc($address)
- );
- }
- if($r) {
- $url = $r[0]['hubloc_url'];
+ try {
+ require_once('library/openid/openid.php');
+ $openid = new LightOpenID(z_root());
+ $openid->identity = $address;
+ $openid->returnUrl = z_root() . '/openid';
+ goaway($openid->authUrl());
+ } catch (Exception $e) {
+ notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
+ }
+
+ // if they're still here...
+ notice( t('Authentication failed.') . EOL);
+ return;
}
else {
- $url = 'https://' . substr($address,strpos($address,'@')+1);
- }
- if($url) {
- $dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
- goaway($url . '/magic' . '?f=&dest=' . $dest);
- }
+ // Presumed Red identity. Perform reverse magic auth
+
+ if(strpos($address,'@') === false) {
+ notice('Invalid address.');
+ return;
+ }
+ $r = null;
+ if($address) {
+ $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
+ dbesc($address)
+ );
+ }
+ if($r) {
+ $url = $r[0]['hubloc_url'];
+ }
+ else {
+ $url = 'https://' . substr($address,strpos($address,'@')+1);
+ }
+ if($url) {
+ $dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
+ goaway($url . '/magic' . '?f=&dest=' . $dest);
+ }
+ }
}
diff --git a/mod/settings.php b/mod/settings.php
index ec758bc90..5b0a8e8f2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -798,6 +798,7 @@ function settings_content(&$a) {
array( t('Anybody in your address book'), PERMS_CONTACTS),
array( t('Anybody on this website'), PERMS_SITE),
array( t('Anybody in this network'), PERMS_NETWORK),
+ array( t('Anybody authenticated'), PERMS_AUTHED),
array( t('Anybody on the internet'), PERMS_PUBLIC)
);
@@ -939,6 +940,7 @@ function settings_content(&$a) {
'$pmacro1' => t('Private - <em>default private, never open or public</em>'),
'$pmacro0' => t('Blocked - <em>default blocked to/from everybody</em>'),
'$permiss_arr' => $permiss,
+ '$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'),array(t('No'),t('Yes'))),
'$lbl_p2macro' => t('Advanced Privacy Settings'),
@@ -978,7 +980,7 @@ function settings_content(&$a) {
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
'$expert' => feature_enabled(local_user(),'expert'),
- '$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'),
+ '$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'),
));
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 6b962c488..7fdb892d2 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -91,7 +91,7 @@ function siteinfo_content(&$a) {
$admininfo = bbcode(get_config('system','admininfo'));
$project_donate = t('Project Donations');
- $donate_text = t('<p>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</p>');
+ $donate_text = t('<p>The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better, freer, and privacy respecting web. Select the following option for a one-time donation of your choosing</p>');
$alternatively = t('<p>or</p>');
$recurring = t('Recurring Donation Options');
@@ -99,12 +99,12 @@ function siteinfo_content(&$a) {
<h3>{$project_donate}</h3>
$donate_text
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"><input type="hidden" name="cmd" value="_donations" /><input type="hidden" name="business" value="mike@macgirvin.com" /><input type="hidden" name="lc" value="US" /><input type="hidden" name="item_name" value="Distributed Social Network Support Donation" /><input type="hidden" name="no_note" value="0" /><input type="hidden" name="currency_code" value="USD" /><input type="hidden" name="bn" value="PP-DonationsBF:btn_donate_LG.gif:NonHostedGuest" /><input style="border: none;" type="image" name="submit" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" alt="Donations gladly accepted to support our work" /></form><br />
-$alternatively
+<strong>$alternatively</strong>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"><input type="hidden" name="cmd" value="_s-xclick" /><input type="hidden" name="hosted_button_id" value="FHV36KE28CYM8" /><br />
<table><tbody><tr><td><input type="hidden" name="on0" value="$recurring" />$recurring</td>
</tr><tr><td>
<select name="os0"><option value="Option 1">Option 1 : $3.00USD - monthly</option><option value="Option 2">Option 2 : $5.00USD - monthly</option><option value="Option 3">Option 3 : $10.00USD - monthly</option><option value="Option 4">Option 4 : $20.00USD - monthly</option></select></td>
-</tr></tbody></table><p><input type="hidden" name="currency_code" value="USD" /><input type="image" border="0" name="submit" src="https://www.paypalobjects.com/en_US/i/btn/btn_subscribeCC_LG.gif" alt="PayPal - The safer, easier way to pay online!" /><img src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" alt="" width="1" height="1" border="0" /></p></form>
+</tr></tbody></table><p><input type="hidden" name="currency_code" value="USD" /><input type="image" style="border: none;" border="0" name="submit" src="https://www.paypalobjects.com/en_US/i/btn/btn_subscribeCC_LG.gif" alt="PayPal - The safer, easier way to pay online!" /><img src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" alt="" width="1" height="1" border="0" /></p></form>
<p></p>
EOT;
diff --git a/version.inc b/version.inc
index b73d1c3e6..4551fa398 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-14.588
+2014-02-18.592
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 73c06fd4b..b180bea61 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -65,3 +65,51 @@ margin-left: 0px;
float:none;
margin-left:0px;
}
+
+/* nav overrides */
+
+nav .badge {
+ position: relative;
+ top: -48px;
+ float: left;
+ font-size: 10px;
+ padding: 2px 6px;
+ cursor: pointer;
+}
+
+nav .dropdown-menu {
+ top: 50px;
+ max-height: 450px;
+ max-width: 300px;
+ overflow-y: auto;
+ margin-top: 0px;
+}
+
+nav .dropdown-menu .contactname {
+ padding-top: 2px;
+ font-weight: bold;
+ display: block;
+}
+
+nav .dropdown-menu img {
+ float: left;
+ margin-right: 5px;
+ width: 32px;
+ height: 32px;
+}
+
+nav .dropdown-menu li a {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ line-height: 1em;
+ padding: 5px 10px;
+}
+
+nav .navbar-collapse {
+ max-height: 450px;
+}
+
+nav .navbar-right li:last-child {
+ padding-right: 20px;
+}
+/* nav overrides end */
diff --git a/view/css/default.css b/view/css/default.css
index 27df38dee..4afcbf1d5 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,18 +1,8 @@
-
-nav {
- height: 24px;
- display: block;
- position: fixed;
- width: 100%;
- z-index: 100;
- background-color: #ff0000;
-}
-
aside#region_1 {
display: block;
width: 210px;
position: absolute;
- top: 48px;
+ top: 65px;
left: 0;
margin-left: 10px;
}
@@ -24,7 +14,7 @@ aside input[type='text'] {
section {
position: absolute;
- top: 48px;
+ top: 65px;
left: 250px;
display: block;
right: 15px;
diff --git a/view/css/mod_mitem.css b/view/css/mod_mitem.css
new file mode 100644
index 000000000..377d164fe
--- /dev/null
+++ b/view/css/mod_mitem.css
@@ -0,0 +1,7 @@
+.menu-item-list {
+ list-style-type: none;
+}
+
+.mitem-edit {
+ margin-right: 15px;
+} \ No newline at end of file
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7ad6d79e5..dcda66b81 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -109,6 +109,9 @@
opacity: 0;
}
+li:hover .group-edit-icon {
+ opacity: 1;
+}
/* affinity - slider */
#main-slider {
diff --git a/view/de/messages.po b/view/de/messages.po
index 9116932b7..7acbdcdd2 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-02-07 00:03-0800\n"
-"PO-Revision-Date: 2014-02-12 07:57+0000\n"
+"POT-Creation-Date: 2014-02-14 00:02-0800\n"
+"PO-Revision-Date: 2014-02-16 07:16+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -29,6 +29,172 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Kategorien"
+
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:184 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
+
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr "Vorschläge"
+
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Mehr anzeigen …"
+
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
+
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
+
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../include/widgets.php:173 ../../include/text.php:754
+#: ../../include/text.php:768 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr "Gesicherte Suchanfragen"
+
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr "hinzufügen"
+
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Gesicherte Ordner"
+
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/widgets.php:318 ../../include/items.php:3636
+msgid "Archives"
+msgstr "Archive"
+
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr "Ich"
+
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr "Beste Freunde"
+
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
+msgid "Friends"
+msgstr "Freunde"
+
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Kollegen"
+
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr "ehem. Freunde"
+
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr "Bekannte"
+
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Jeder"
+
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Funktions-Einstellungen"
+
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "Verbundene Apps"
+
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Kanal exportieren"
+
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Automatische Berechtigungen (Erweitert)"
+
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanal-Quellen"
+
+#: ../../include/widgets.php:487 ../../include/nav.php:181
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "E-Mails abrufen"
+
+#: ../../include/widgets.php:509 ../../include/nav.php:172
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chaträume"
+
#: ../../include/acl_selectors.php:235
msgid "Visible to everybody"
msgstr "Für jeden sichtbar"
@@ -121,7 +287,7 @@ msgstr "Chat"
#: ../../include/nav.php:81
msgid "Your chatrooms"
-msgstr "Deine Chat-Räume"
+msgstr "Deine Chaträume"
#: ../../include/nav.php:82 ../../include/nav.php:175
#: ../../include/conversation.php:1506 ../../mod/events.php:354
@@ -130,7 +296,7 @@ msgstr "Veranstaltungen"
#: ../../include/nav.php:82
msgid "Your events"
-msgstr "Deine Veransctaltungen"
+msgstr "Deine Veranstaltungen"
#: ../../include/nav.php:83 ../../include/conversation.php:1514
msgid "Bookmarks"
@@ -163,7 +329,7 @@ msgstr "%s - Klick zum Abmelden"
#: ../../include/nav.php:111
msgid "Click to authenticate to your home hub"
-msgstr "Klick zum Authentifizieren bei Deinem Heimat-Hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
#: ../../include/nav.php:125
msgid "Home Page"
@@ -202,7 +368,7 @@ msgstr "Suche"
msgid "Search site content"
msgstr "Durchsuche Seiten-Inhalt"
-#: ../../include/nav.php:142 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:211
msgid "Directory"
msgstr "Verzeichnis"
@@ -282,10 +448,6 @@ msgstr "Eingang"
msgid "Outbox"
msgstr "Ausgang"
-#: ../../include/nav.php:172 ../../include/widgets.php:509
-msgid "New Message"
-msgstr "Neue Nachricht"
-
#: ../../include/nav.php:175
msgid "Event Calendar"
msgstr "Veranstaltungskalender"
@@ -306,11 +468,6 @@ msgstr "Kanal-Auswahl"
msgid "Manage Your Channels"
msgstr "Verwalte Deine Kanäle"
-#: ../../include/nav.php:181 ../../include/widgets.php:487
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
-msgid "Settings"
-msgstr "Einstellungen"
-
#: ../../include/nav.php:181
msgid "Account/Channel Settings"
msgstr "Konto-/Kanal-Einstellungen"
@@ -321,7 +478,7 @@ msgstr "Verbindungen"
#: ../../include/nav.php:183
msgid "Manage/Edit Friends and Connections"
-msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
+msgstr "Freunde und Verbindungen verwalten"
#: ../../include/nav.php:190 ../../mod/admin.php:112
msgid "Admin"
@@ -376,12 +533,7 @@ msgstr[1] "%d Verbindungen"
#: ../../include/text.php:693
msgid "View Connections"
-msgstr "Zeige Verbindungen"
-
-#: ../../include/text.php:754 ../../include/text.php:768
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Speichern"
+msgstr "Verbindungen anzeigen"
#: ../../include/text.php:834
msgid "poke"
@@ -613,7 +765,7 @@ msgstr "Link zum Originalbeitrag"
#: ../../include/text.php:1436
msgid "Select a page layout: "
-msgstr "Ein Seiten-Layout auswählen"
+msgstr "Ein Seiten-Layout auswählen:"
#: ../../include/text.php:1439 ../../include/text.php:1504
msgid "default"
@@ -621,7 +773,7 @@ msgstr "Standard"
#: ../../include/text.php:1475
msgid "Page content type: "
-msgstr "Content-Typ der Seite"
+msgstr "Content-Typ der Seite:"
#: ../../include/text.php:1516
msgid "Select an alternate language"
@@ -671,157 +823,36 @@ msgstr "Layouts"
msgid "Pages"
msgstr "Seiten"
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
-msgstr "Kategorien"
-
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../mod/directory.php:183 ../../mod/match.php:62
-#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
-msgid "Connect"
-msgstr "Verbinden"
-
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
+#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
+#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
+#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
+#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
+#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
+#: ../../include/bbcode.php:633
+msgid "Image/photo"
+msgstr "Bild/Foto"
-#: ../../include/widgets.php:123 ../../mod/connections.php:238
-msgid "Suggestions"
-msgstr "Vorschläge"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
-#: ../../include/widgets.php:124
-msgid "See more..."
-msgstr "Mehr anzeigen..."
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR-Code"
-#: ../../include/widgets.php:146
+#: ../../include/bbcode.php:213
#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen."
-
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
-
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
-
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
-
-#: ../../include/widgets.php:171
-msgid "Notes"
-msgstr "Notizen"
-
-#: ../../include/widgets.php:243
-msgid "Remove term"
-msgstr "Eintrag löschen"
-
-#: ../../include/widgets.php:252 ../../include/features.php:52
-msgid "Saved Searches"
-msgstr "Gesicherte Suchanfragen"
-
-#: ../../include/widgets.php:253 ../../include/group.php:290
-msgid "add"
-msgstr "hinzufügen"
-
-#: ../../include/widgets.php:283 ../../include/features.php:66
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr "Gesicherte Ordner"
-
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../include/widgets.php:318 ../../include/items.php:3613
-msgid "Archives"
-msgstr "Archive"
-
-#: ../../include/widgets.php:370
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: ../../include/widgets.php:371 ../../mod/connedit.php:389
-msgid "Me"
-msgstr "Ich"
-
-#: ../../include/widgets.php:372 ../../mod/connedit.php:391
-msgid "Best Friends"
-msgstr "Beste Freunde"
-
-#: ../../include/widgets.php:373 ../../include/identity.php:310
-#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
-msgid "Friends"
-msgstr "Freunde"
-
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr "Kollegen"
-
-#: ../../include/widgets.php:375 ../../mod/connedit.php:393
-msgid "Former Friends"
-msgstr "ehem. Freunde"
-
-#: ../../include/widgets.php:376 ../../mod/connedit.php:394
-msgid "Acquaintances"
-msgstr "Bekanntschaften"
-
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr "Jeder"
-
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
-
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
-
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
-
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr "Funktions-Einstellungen"
-
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr "Verbundene Apps"
-
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr "Kanal exportieren"
-
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr "Automatische Berechtigungen (Erweitert)"
-
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr "Prämium-Kanal Einstellungen"
-
-#: ../../include/widgets.php:476 ../../include/features.php:43
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanal Quellen"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr "E-Mails abrufen"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "Beitrag"
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
-msgstr "Chaträume"
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
#: ../../include/Contact.php:120
msgid "New window"
@@ -861,7 +892,7 @@ msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
#: ../../include/features.php:28
msgid "Private Notes"
-msgstr "private Notizen"
+msgstr "Private Notizen"
#: ../../include/features.php:28
msgid "Enables a tool to store notes and reminders"
@@ -875,7 +906,7 @@ msgstr "Erweitertes Teilen von Identitäten"
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."
+msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt."
#: ../../include/features.php:34
msgid "Expert Mode"
@@ -883,7 +914,7 @@ msgstr "Expertenmodus"
#: ../../include/features.php:34
msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen"
+msgstr "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren"
#: ../../include/features.php:35
msgid "Premium Channel"
@@ -893,7 +924,7 @@ msgstr "Premium-Kanal"
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"
+msgstr "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals"
#: ../../include/features.php:40
msgid "Post Composition Features"
@@ -917,7 +948,7 @@ msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
#: ../../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."
+msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds"
#: ../../include/features.php:44
msgid "Even More Encryption"
@@ -978,7 +1009,7 @@ msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
#: ../../include/features.php:56
msgid "Suggest Channels"
-msgstr "Kanäle Vorschlagen"
+msgstr "Kanäle vorschlagen"
#: ../../include/features.php:56
msgid "Show channel suggestions"
@@ -1022,7 +1053,7 @@ msgstr "Gefällt-mir-nicht Beiträge"
#: ../../include/features.php:67
msgid "Ability to dislike posts/comments"
-msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
+msgstr "„Gefällt mir nicht“ ermöglichen"
#: ../../include/features.php:68
msgid "Star Posts"
@@ -1034,11 +1065,11 @@ msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
#: ../../include/features.php:69
msgid "Tag Cloud"
-msgstr "Tag Wolke"
+msgstr "Schlagwort-Wolke"
#: ../../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"
+msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"
#: ../../include/contact_selectors.php:30
msgid "Unknown | Not categorised"
@@ -1205,7 +1236,7 @@ msgstr "vor %1$d %2$s"
#: ../../include/dba/dba_driver.php:50
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
+msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
msgid "l F d, Y \\@ g:i A"
@@ -1221,7 +1252,7 @@ msgstr "Endet:"
#: ../../include/event.php:40 ../../include/identity.php:679
#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+#: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
msgid "Location:"
msgstr "Ort:"
@@ -1264,12 +1295,12 @@ msgstr "Kanäle, die nicht in einer Sammlung sind"
msgid "Delete this item?"
msgstr "Dieses Element löschen?"
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
-#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:547
+#: ../../mod/photos.php:993 ../../mod/photos.php:1080
msgid "Comment"
msgstr "Kommentar"
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:281
#: ../../include/contact_widgets.php:125
msgid "show more"
msgstr "mehr zeigen"
@@ -1292,11 +1323,11 @@ msgstr "alle"
#: ../../include/js_strings.php:12
msgid "Secret Passphrase"
-msgstr "geheime Passwort-Phrase"
+msgstr "geheime Passphrase"
#: ../../include/js_strings.php:13
msgid "Passphrase hint"
-msgstr "Hinweis zur Phrase"
+msgstr "Hinweis zur Passphrase"
#: ../../include/js_strings.php:15
msgid "timeago.prefixAgo"
@@ -1390,7 +1421,7 @@ msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
#: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
-#: ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/photos.php:656 ../../mod/photos.php:678
msgid "Profile Photos"
msgstr "Profilfotos"
@@ -1399,34 +1430,33 @@ msgstr "Profilfotos"
#: ../../include/attach.php:233 ../../include/attach.php:247
#: ../../include/attach.php:268 ../../include/attach.php:463
#: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3492
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
+#: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
-#: ../../mod/chat.php:87 ../../mod/chat.php:92
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
-#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
+#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
+#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
+#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
#: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
-#: ../../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/achievements.php:27 ../../mod/settings.php:493
+#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/connections.php:169 ../../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/filestorage.php:10
#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:526
#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
msgid "Permission denied."
msgstr "Zugang verweigert"
@@ -1455,7 +1485,7 @@ msgstr "Datei überschreitet das Größen-Limit von %d"
#: ../../include/attach.php:339
#, php-format
msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
#: ../../include/attach.php:423
msgid "File upload failed. Possible system limit or action terminated."
@@ -1471,7 +1501,7 @@ msgstr "Pfad nicht verfügbar."
#: ../../include/attach.php:546
msgid "Empty pathname"
-msgstr "leere Pfadangabe"
+msgstr "Leere Pfadangabe"
#: ../../include/attach.php:564
msgid "duplicate filename or path"
@@ -1489,41 +1519,10 @@ msgstr "mkdir fehlgeschlagen."
msgid "database storage failed."
msgstr "Speichern in der Datenbank fehlgeschlagen."
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
-#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
-#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
-#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
-#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
-#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
-#: ../../include/bbcode.php:626
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
-
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr "QR Code"
-
-#: ../../include/bbcode.php:213
-#, 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:215
-msgid "post"
-msgstr "Beitrag"
-
-#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
-
#: ../../include/bookmarks.php:31
#, php-format
msgid "%1$s's bookmarks"
-msgstr "%1$s's Lesezeichen"
+msgstr "%1$ss Lesezeichen"
#: ../../include/conversation.php:123
msgid "channel"
@@ -1532,12 +1531,12 @@ msgstr "Kanal"
#: ../../include/conversation.php:161 ../../mod/like.php:134
#, php-format
msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s"
+msgstr "%1$s gefällt %2$ss %3$s"
#: ../../include/conversation.php:164 ../../mod/like.php:136
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s mag %2$s's %3$s nicht"
+msgstr "%1$s gefällt %2$ss %3$s nicht"
#: ../../include/conversation.php:201
#, php-format
@@ -1547,7 +1546,7 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
#: ../../include/conversation.php:236
#, php-format
msgid "%1$s poked %2$s"
-msgstr "%1$s stupste %2$s"
+msgstr "%1$s stupste %2$s an"
#: ../../include/conversation.php:258 ../../mod/mood.php:63
#, php-format
@@ -1559,9 +1558,9 @@ msgid "Select"
msgstr "Auswählen"
#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
-#: ../../mod/admin.php:745 ../../mod/connedit.php:359
-#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
+#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
msgid "Delete"
msgstr "Löschen"
@@ -1572,7 +1571,7 @@ msgstr "Nachricht überprüft"
#: ../../include/conversation.php:662
#, php-format
msgid "View %s's profile @ %s"
-msgstr "Schaue Dir %s's Profil auf %s an."
+msgstr "%ss Profil auf %s ansehen"
#: ../../include/conversation.php:676
msgid "Categories:"
@@ -1602,10 +1601,10 @@ msgid "View in context"
msgstr "Im Zusammenhang anschauen"
#: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
-#: ../../mod/photos.php:971
+#: ../../mod/photos.php:975
msgid "Please wait"
msgstr "Bitte warten"
@@ -1639,7 +1638,7 @@ msgstr "Fotos ansehen"
#: ../../include/conversation.php:935
msgid "Matrix Activity"
-msgstr "Matrix Aktivität"
+msgstr "Matrix-Aktivität"
#: ../../include/conversation.php:936
msgid "Edit Contact"
@@ -1725,21 +1724,21 @@ msgstr "Speichern in Ordner:"
#: ../../include/conversation.php:1072
msgid "Where are you right now?"
-msgstr "Wo bist du jetzt grade?"
+msgstr "Wo bist Du jetzt grade?"
#: ../../include/conversation.php:1073 ../../mod/editpost.php:52
#: ../../mod/mail.php:172 ../../mod/mail.php:270
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verfällt YYYY-MM-DD HH;MM"
-#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
-#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+#: ../../mod/editblock.php:151 ../../mod/photos.php:995
msgid "Preview"
msgstr "Vorschau"
-#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+#: ../../include/conversation.php:1097 ../../mod/photos.php:974
msgid "Share"
msgstr "Teilen"
@@ -1853,19 +1852,19 @@ msgstr "Beispiel: bob@example.com, mary@example.com"
msgid "Set expiration date"
msgstr "Verfallsdatum"
-#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
msgid "Encrypt text"
msgstr "Text verschlüsseln"
#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
msgid "OK"
-msgstr "OK"
+msgstr "Ok"
-#: ../../include/conversation.php:1150 ../../mod/settings.php:514
-#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
msgid "Cancel"
msgstr "Abbrechen"
@@ -1891,7 +1890,7 @@ msgstr "Persönlich"
#: ../../include/conversation.php:1397
msgid "Posts that mention or involve you"
-msgstr "Beiträge mit Beteiligung deinerseits"
+msgstr "Beiträge mit Beteiligung Deinerseits"
#: ../../include/conversation.php:1400 ../../mod/menu.php:61
#: ../../mod/connections.php:211
@@ -1900,7 +1899,7 @@ msgstr "Neu"
#: ../../include/conversation.php:1403
msgid "Activity Stream - by date"
-msgstr "Activity Stream - nach Datum sortiert"
+msgstr "Activity Stream – nach Datum sortiert"
#: ../../include/conversation.php:1410
msgid "Starred"
@@ -1908,7 +1907,7 @@ msgstr "Markiert"
#: ../../include/conversation.php:1413
msgid "Favourite Posts"
-msgstr "Beiträge mit Sternchen"
+msgstr "Markierte Beiträge"
#: ../../include/conversation.php:1420
msgid "Spam"
@@ -1916,7 +1915,7 @@ msgstr "Spam"
#: ../../include/conversation.php:1423
msgid "Posts flagged as SPAM"
-msgstr "Nachrichten die als SPAM markiert wurden"
+msgstr "Nachrichten, die als SPAM markiert wurden"
#: ../../include/conversation.php:1454
msgid "Channel"
@@ -1944,7 +1943,7 @@ msgstr "Dateien und Speicher"
#: ../../include/conversation.php:1496 ../../include/conversation.php:1499
msgid "Chatrooms"
-msgstr "Chat-Räume"
+msgstr "Chaträume"
#: ../../include/conversation.php:1509
msgid "Events and Calendar"
@@ -1958,7 +1957,7 @@ msgstr "Gespeicherte Lesezeichen"
msgid "Manage Webpages"
msgstr "Webseiten verwalten"
-#: ../../include/identity.php:29 ../../mod/item.php:1161
+#: ../../include/identity.php:29 ../../mod/item.php:1177
msgid "Unable to obtain identity information from database"
msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
@@ -1997,7 +1996,7 @@ msgstr "Angeforderte Kanal nicht verfügbar."
#: ../../include/identity.php:489
msgid " Sorry, you don't have the permission to view this profile. "
-msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen."
+msgstr "Entschuldigung, Du besitzt nicht die nötigen Rechte, um dieses Profil zu betrachten."
#: ../../include/identity.php:524 ../../mod/webpages.php:8
#: ../../mod/connect.php:13 ../../mod/layouts.php:8
@@ -2008,7 +2007,7 @@ msgstr "Erwünschte Profil ist nicht verfügbar."
#: ../../include/identity.php:642 ../../mod/profiles.php:603
msgid "Change profile photo"
-msgstr "Ändere das Profilfoto"
+msgstr "Profilfoto ändern"
#: ../../include/identity.php:648
msgid "Profiles"
@@ -2039,17 +2038,17 @@ msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten"
#: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
+#: ../../mod/directory.php:159
msgid "Gender:"
msgstr "Geschlecht:"
#: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
+#: ../../mod/directory.php:161
msgid "Status:"
msgstr "Status:"
#: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
+#: ../../mod/directory.php:163
msgid "Homepage:"
msgstr "Homepage:"
@@ -2096,7 +2095,7 @@ msgstr "Veranstaltungen in dieser Woche:"
msgid "Profile"
msgstr "Profil"
-#: ../../include/identity.php:906 ../../mod/settings.php:920
+#: ../../include/identity.php:906 ../../mod/settings.php:924
msgid "Full Name:"
msgstr "Voller Name:"
@@ -2119,7 +2118,7 @@ msgstr "Alter:"
#: ../../include/identity.php:934
#, php-format
msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
+msgstr "seit %1$d %2$s"
#: ../../include/identity.php:937 ../../mod/profiles.php:526
msgid "Sexual Preference:"
@@ -2141,7 +2140,7 @@ msgstr "Politische Ansichten:"
msgid "Religion:"
msgstr "Religion:"
-#: ../../include/identity.php:949 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:165
msgid "About:"
msgstr "Über:"
@@ -2151,11 +2150,11 @@ msgstr "Hobbys/Interessen:"
#: ../../include/identity.php:953 ../../mod/profiles.php:532
msgid "Likes:"
-msgstr "Gefällt-mir:"
+msgstr "Gefällt:"
#: ../../include/identity.php:955 ../../mod/profiles.php:533
msgid "Dislikes:"
-msgstr "Gefällt-mir-nicht:"
+msgstr "Gefällt nicht:"
#: ../../include/identity.php:958
msgid "Contact information and Social Networks:"
@@ -2193,14 +2192,14 @@ msgstr "Arbeit/Anstellung:"
msgid "School/education:"
msgstr "Schule/Ausbildung:"
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:847
msgid "Private Message"
msgstr "Private Nachricht"
#: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/settings.php:575 ../../mod/editpost.php:103
-#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
+#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
msgid "Edit"
@@ -2220,7 +2219,7 @@ msgstr "Markierung entfernen"
#: ../../include/ItemObject.php:148
msgid "toggle star status"
-msgstr "Stern-Status umschalten"
+msgstr "Markierung umschalten"
#: ../../include/ItemObject.php:152
msgid "starred"
@@ -2230,21 +2229,21 @@ msgstr "markiert"
msgid "add tag"
msgstr "Schlagwort hinzufügen"
-#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:972
msgid "I like this (toggle)"
-msgstr "Ich mag das (Umschalter)"
+msgstr "Mir gefällt das (Umschalter)"
#: ../../include/ItemObject.php:184 ../../include/taxonomy.php:254
msgid "like"
-msgstr "Gefällt-mir"
+msgstr "mag"
-#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:973
msgid "I don't like this (toggle)"
-msgstr "Ich mag das nicht (Umschalter)"
+msgstr "Mir gefällt das nicht (Umschalter)"
#: ../../include/ItemObject.php:185 ../../include/taxonomy.php:255
msgid "dislike"
-msgstr "Gefällt-mir-nicht"
+msgstr "verurteile"
#: ../../include/ItemObject.php:187
msgid "Share this"
@@ -2257,11 +2256,11 @@ msgstr "Teilen"
#: ../../include/ItemObject.php:211 ../../include/ItemObject.php:212
#, php-format
msgid "View %s's profile - %s"
-msgstr "Schaue dir %s's Profil an - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
#: ../../include/ItemObject.php:213
msgid "to"
-msgstr "zu"
+msgstr "an"
#: ../../include/ItemObject.php:214
msgid "via"
@@ -2275,37 +2274,37 @@ msgstr "Wall-to-Wall"
msgid "via Wall-To-Wall:"
msgstr "via Wall-To-Wall:"
-#: ../../include/ItemObject.php:249
+#: ../../include/ItemObject.php:250
msgid "Bookmark Links"
-msgstr "Setze Lesezeichen für die Verweise"
+msgstr "Setze Lesezeichen für die Links"
-#: ../../include/ItemObject.php:279
+#: ../../include/ItemObject.php:280
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] "%d Kommentar"
msgstr[1] "%d Kommentare"
-#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
-#: ../../mod/photos.php:1074
+#: ../../include/ItemObject.php:545 ../../mod/photos.php:991
+#: ../../mod/photos.php:1078
msgid "This is you"
-msgstr "Das bist du"
-
-#: ../../include/ItemObject.php:547 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/settings.php:513 ../../mod/settings.php:625
-#: ../../mod/settings.php:653 ../../mod/settings.php:677
-#: ../../mod/settings.php:748 ../../mod/settings.php:912
-#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+msgstr "Das bist Du"
+
+#: ../../include/ItemObject.php:548 ../../mod/events.php:469
+#: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
#: ../../mod/connedit.php:437 ../../mod/profiles.php:506
#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/settings.php:516
+#: ../../mod/settings.php:628 ../../mod/settings.php:656
+#: ../../mod/settings.php:680 ../../mod/settings.php:752
+#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
#: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
-#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
-#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:566
+#: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
+#: ../../mod/photos.php:1081 ../../mod/mood.php:142
#: ../../view/theme/redbasic/php/config.php:95
#: ../../view/theme/apw/php/config.php:231
#: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2313,35 +2312,35 @@ msgstr "Das bist du"
msgid "Submit"
msgstr "Bestätigen"
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:549
msgid "Bold"
msgstr "Fett"
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:550
msgid "Italic"
msgstr "Kursiv"
-#: ../../include/ItemObject.php:550
+#: ../../include/ItemObject.php:551
msgid "Underline"
msgstr "Unterstrichen"
-#: ../../include/ItemObject.php:551
+#: ../../include/ItemObject.php:552
msgid "Quote"
msgstr "Zitat"
-#: ../../include/ItemObject.php:552
+#: ../../include/ItemObject.php:553
msgid "Code"
msgstr "Code"
-#: ../../include/ItemObject.php:553
+#: ../../include/ItemObject.php:554
msgid "Image"
msgstr "Bild"
-#: ../../include/ItemObject.php:554
+#: ../../include/ItemObject.php:555
msgid "Link"
msgstr "Link"
-#: ../../include/ItemObject.php:555
+#: ../../include/ItemObject.php:556
msgid "Video"
msgstr "Video"
@@ -2612,11 +2611,11 @@ msgstr "Der Raum ist voll"
#: ../../include/taxonomy.php:210
msgid "Tags"
-msgstr "Tags"
+msgstr "Schlagwörter"
#: ../../include/taxonomy.php:227
msgid "Keywords"
-msgstr "Schlüsselbegriffe"
+msgstr "Schlüsselwörter"
#: ../../include/taxonomy.php:252
msgid "have"
@@ -2636,11 +2635,11 @@ msgstr "will"
#: ../../include/taxonomy.php:254
msgid "likes"
-msgstr "Gefällt-mir"
+msgstr "gefällt"
#: ../../include/taxonomy.php:255
msgid "dislikes"
-msgstr "Gefällt-mir-nicht"
+msgstr "missfällt"
#: ../../include/auth.php:76
msgid "Logged out."
@@ -2660,7 +2659,7 @@ msgstr "Ungültige E-Mail-Adresse"
#: ../../include/account.php:25
msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind"
+msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt"
#: ../../include/account.php:31
msgid "Your email address is already registered at this site."
@@ -2694,7 +2693,7 @@ msgstr "Administrator"
#: ../../include/account.php:297
msgid "your registration password"
-msgstr "dein Registrierungspasswort"
+msgstr "Dein Registrierungspasswort"
#: ../../include/account.php:300 ../../include/account.php:357
#, php-format
@@ -2768,12 +2767,12 @@ msgstr "[Red Notify] Neue Mail auf %s empfangen"
#: ../../include/enotify.php:86
#, php-format
msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat dir eine private Nachricht auf %3$s gesendet."
+msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
#: ../../include/enotify.php:87
#, php-format
msgid "%1$s sent you %2$s."
-msgstr "%1$s hat dir %2$s geschickt."
+msgstr "%1$s hat Dir %2$s geschickt."
#: ../../include/enotify.php:87
msgid "a private message"
@@ -2797,7 +2796,7 @@ msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
#: ../../include/enotify.php:159
#, php-format
msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen %4$s[/zrl] kommentiert"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
#: ../../include/enotify.php:170
#, php-format
@@ -2807,14 +2806,14 @@ msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
#: ../../include/enotify.php:171
#, php-format
msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s hat ein Thema kommentiert, dem du folgst."
+msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
#: ../../include/enotify.php:174 ../../include/enotify.php:189
#: ../../include/enotify.php:215 ../../include/enotify.php:234
#: ../../include/enotify.php:248
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
#: ../../include/enotify.php:180
#, php-format
@@ -2824,57 +2823,57 @@ msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
#: ../../include/enotify.php:182
#, php-format
msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf deine Pinnwand auf %3$s geschrieben"
+msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
#: ../../include/enotify.php:184
#, php-format
msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]deine Pinnwand[/zrl] geschrieben"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
#: ../../include/enotify.php:208
#, php-format
msgid "[Red:Notify] %s tagged you"
-msgstr "[Red Notify] %s hat dich getaggt"
+msgstr "[Red Notify] %s hat Dich erwähnt"
#: ../../include/enotify.php:209
#, php-format
msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s getaggt"
+msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
#: ../../include/enotify.php:210
#, php-format
msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat dich erwähnt[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
#: ../../include/enotify.php:223
#, php-format
msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red Notify] %1$s hat dich angestupst"
+msgstr "[Red Notify] %1$s hat Dich angestupst"
#: ../../include/enotify.php:224
#, php-format
msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat dich auf %3$s angestubst"
+msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
#: ../../include/enotify.php:225
#, php-format
msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat dich angestupst[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
#: ../../include/enotify.php:241
#, php-format
msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Hinweis] %s hat Dich getaggt"
+msgstr "[Red:Hinweis] %s hat Deinen Beitrag verschlagwortet"
#: ../../include/enotify.php:242
#, php-format
msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat deinen Beitrag auf %3$s getaggt"
+msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
#: ../../include/enotify.php:243
#, php-format
msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]deinen Beitrag[/zrl] getaggt"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
#: ../../include/enotify.php:255
msgid "[Red:Notify] Introduction received"
@@ -2883,12 +2882,12 @@ msgstr "[Red:Notify] Vorstellung erhalten"
#: ../../include/enotify.php:256
#, php-format
msgid "%1$s, you've received an introduction from '%2$s' at %3$s"
-msgstr "%1$s, du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
+msgstr "%1$s, Du hast eine Vorstellung von „%2$s“ auf %3$s erhalten"
#: ../../include/enotify.php:257
#, php-format
msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s."
-msgstr "%1$s, du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
+msgstr "%1$s, Du hast [zrl=%2$s]eine Vorstellung[/zrl] von %3$s erhalten."
#: ../../include/enotify.php:261 ../../include/enotify.php:280
#, php-format
@@ -2907,14 +2906,14 @@ msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
#: ../../include/enotify.php:271
#, php-format
msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, du hast einen Freundschaftsvorschlag von „%2$s“ auf %3$s erhalten"
+msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
#: ../../include/enotify.php:272
#, php-format
msgid ""
"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
"%4$s."
-msgstr "%1$s, du hast [zrl=%2$s]einen Freundschaftvorschlag[/zrl] für %3$s von %4$s erhalten."
+msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
#: ../../include/enotify.php:278
msgid "Name:"
@@ -2946,12 +2945,12 @@ msgstr "Kann Bild nicht verarbeiten"
msgid "Photo storage failed."
msgstr "Foto speichern schlug fehl"
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1187
+#: ../../include/photos.php:306 ../../mod/photos.php:694
+#: ../../mod/photos.php:1191
msgid "Upload New Photos"
msgstr "Lade neue Fotos hoch"
-#: ../../include/reddav.php:1018
+#: ../../include/reddav.php:1061
msgid "Edit File properties"
msgstr "Dateieigenschaften ändern"
@@ -2978,8 +2977,8 @@ msgstr "Verbinden/Folgen"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Beispiele: Robert Morgenstein, Angeln"
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:357
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:207
+#: ../../mod/directory.php:212 ../../mod/connections.php:357
msgid "Find"
msgstr "Finde"
@@ -3044,7 +3043,7 @@ msgstr "Lokales Konto nicht gefunden."
#: ../../include/follow.php:138
msgid "Cannot connect to yourself."
-msgstr "Du kannst dich nicht mit dir selbst verbinden."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
#: ../../include/security.php:280
msgid ""
@@ -3131,11 +3130,11 @@ msgstr "Kann meine öffentlichen Seiten bearbeiten"
#: ../../include/permissions.php:31
msgid "Can source my \"public\" posts in derived channels"
-msgstr "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden"
+msgstr "Kann meine „öffentlichen“ Beiträge als Quellen für andere Kanäle verwenden"
#: ../../include/permissions.php:31
msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften."
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
#: ../../include/permissions.php:32
msgid "Can send me bookmarks"
@@ -3148,50 +3147,50 @@ msgstr "Kann meine Kanäle administrieren"
#: ../../include/permissions.php:33
msgid ""
"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:350
+#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../mod/group.php:68 ../../index.php:350
msgid "Permission denied"
msgstr "Keine Berechtigung"
-#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
#: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
msgid "Item not found."
msgstr "Element nicht gefunden."
-#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr "Sammlung nicht gefunden"
-#: ../../include/items.php:3801
+#: ../../include/items.php:3824
msgid "Collection is empty."
msgstr "Sammlung ist leer."
-#: ../../include/items.php:3808
+#: ../../include/items.php:3831
#, php-format
msgid "Collection: %s"
msgstr "Sammlung: %s"
-#: ../../include/items.php:3819
+#: ../../include/items.php:3842
#, php-format
msgid "Connection: %s"
msgstr "Verbindung: %s"
-#: ../../include/items.php:3822
+#: ../../include/items.php:3845
msgid "Connection not found."
msgstr "Die Verbindung wurde nicht gefunden."
-#: ../../include/zot.php:545
+#: ../../include/zot.php:548
msgid "Invalid data packet"
msgstr "Ungültiges Datenpaket"
-#: ../../include/zot.php:555
+#: ../../include/zot.php:558
msgid "Unable to verify channel signature"
msgstr "Konnte die Signatur des Kanals nicht verifizieren"
-#: ../../include/zot.php:732
+#: ../../include/zot.php:735
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
@@ -3277,62 +3276,70 @@ msgstr "Titel:"
msgid "Share this event"
msgstr "Die Veranstaltung teilen"
-#: ../../mod/thing.php:94
+#: ../../mod/thing.php:98
msgid "Thing updated"
msgstr "Ding aktualisiert"
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:158
msgid "Object store: failed"
msgstr "Speichern des Objekts fehlgeschlagen"
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:162
msgid "Thing added"
msgstr "Ding hinzugefügt"
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:182
#, php-format
msgid "OBJ: %1$s %2$s %3$s"
msgstr "OBJ: %1$s %2$s %3$s"
-#: ../../mod/thing.php:228
+#: ../../mod/thing.php:234
msgid "Show Thing"
msgstr "Ding anzeigen"
-#: ../../mod/thing.php:235
+#: ../../mod/thing.php:241
msgid "item not found."
msgstr "Eintrag nicht gefunden"
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:269
msgid "Edit Thing"
msgstr "Ding bearbeiten"
-#: ../../mod/thing.php:265 ../../mod/thing.php:311
+#: ../../mod/thing.php:271 ../../mod/thing.php:318
msgid "Select a profile"
msgstr "Wähle ein Profil"
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:273 ../../mod/thing.php:320
msgid "Select a category of stuff. e.g. I ______ something"
-msgstr "Wähle eine Kategorie für das Zeugs, z.B. Ich ______ etwas"
+msgstr "Wähle eine Kategorie/Art, z.B. Ich ______ etwas"
+
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
-#: ../../mod/thing.php:270 ../../mod/thing.php:315
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
+
+#: ../../mod/thing.php:277 ../../mod/thing.php:323
msgid "Name of thing e.g. something"
msgstr "Name des Dings, z.B. Etwas"
-#: ../../mod/thing.php:272 ../../mod/thing.php:316
+#: ../../mod/thing.php:279 ../../mod/thing.php:324
msgid "URL of thing (optional)"
msgstr "URL des Dings (optional)"
-#: ../../mod/thing.php:274 ../../mod/thing.php:317
+#: ../../mod/thing.php:281 ../../mod/thing.php:325
msgid "URL for photo of thing (optional)"
msgstr "URL eines Fotos von dem Ding (optional)"
-#: ../../mod/thing.php:309
+#: ../../mod/thing.php:316
msgid "Add Thing to your Profile"
-msgstr "Das Ding deinem Profil hinzufügen"
+msgstr "Das Ding Deinem Profil hinzufügen"
#: ../../mod/invite.php:25
msgid "Total invitation limit exceeded."
-msgstr "Limit der maximalen Einladungen überschritten."
+msgstr "Einladungslimit überschritten."
#: ../../mod/invite.php:49
#, php-format
@@ -3345,7 +3352,7 @@ msgstr "Schließe Dich uns an und werde Teil der Red-Matrix"
#: ../../mod/invite.php:87
msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator deiner Seite."
+msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers."
#: ../../mod/invite.php:92
#, php-format
@@ -3380,7 +3387,7 @@ msgid ""
"You are cordially invited to join me and some other close friends on the Red"
" Matrix - a revolutionary new decentralised communication and information "
"tool."
-msgstr "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk."
+msgstr "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralen Kommunikations- und Informationsnetzwerk."
#: ../../mod/invite.php:146
msgid "You will need to supply this invitation code: $invite_code"
@@ -3394,7 +3401,7 @@ msgstr "Bitte besuche meinen Kanal auf"
msgid ""
"Once you have registered (on ANY Red Matrix site - they are all inter-"
"connected), please connect with my Red Matrix channel address:"
-msgstr "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:"
+msgstr "Wenn Du Dich registriert hast (egal auf welchem Server in der Red-Matrix, sie sind alle miteinander verbunden) verbinde Dich bitte mit meinem Kanal in der Matrix. Adresse:"
#: ../../mod/invite.php:153
msgid "Click the [Register] link on the following page to join."
@@ -3405,34 +3412,34 @@ msgid ""
"For more information about the Red Matrix Project and why it has the "
"potential to change the internet as we know it, please visit "
"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"
+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, besuche http://getzot.com"
#: ../../mod/item.php:145
msgid "Unable to locate original post."
-msgstr "Originalbeitrag kann nicht gefunden werden."
+msgstr "Originalbeitrag nicht gefunden."
#: ../../mod/item.php:346
msgid "Empty post discarded."
-msgstr "Leerer Beitrag verworfen."
+msgstr "Leeren Beitrag verworfen."
#: ../../mod/item.php:388
msgid "Executable content type not permitted to this channel."
msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
-#: ../../mod/item.php:819
+#: ../../mod/item.php:835
msgid "System error. Post not saved."
msgstr "Systemfehler. Beitrag nicht gespeichert."
-#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
msgid "Wall Photos"
msgstr "Wall Fotos"
-#: ../../mod/item.php:1166
+#: ../../mod/item.php:1182
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
-#: ../../mod/item.php:1172
+#: ../../mod/item.php:1188
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
@@ -3487,7 +3494,7 @@ msgstr "Menü Name"
#: ../../mod/menu.php:81 ../../mod/menu.php:110
msgid "Must be unique, only seen by you"
-msgstr "Muss unverwechselbar sein, nur für dich sichtbar"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
#: ../../mod/menu.php:82 ../../mod/menu.php:111
msgid "Menu title"
@@ -3545,11 +3552,11 @@ msgstr "Ansicht"
#: ../../mod/api.php:76 ../../mod/api.php:102
msgid "Authorize application connection"
-msgstr "Zugriff der Anwendung authorizieren"
+msgstr "Zugriff für die Anwendung autorisieren"
#: ../../mod/api.php:77
msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode bei der Anwendung ein:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
#: ../../mod/api.php:89
msgid "Please login to continue."
@@ -3559,21 +3566,21 @@ msgstr "Zum Weitermachen, bitte einloggen."
msgid ""
"Do you want to authorize this application to access your posts and contacts,"
" 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?"
+msgstr "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
-#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:483
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
msgid "Yes"
msgstr "Ja"
-#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:484
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
msgid "No"
msgstr "Nein"
#: ../../mod/apps.php:8
msgid "No installed applications."
-msgstr "Keine installierten Applikationen"
+msgstr "Keine installierten Anwendungen."
#: ../../mod/apps.php:13
msgid "Applications"
@@ -3585,7 +3592,7 @@ msgstr "Bearbeite Beitrag"
#: ../../mod/cloud.php:112
msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
+msgstr "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++"
#: ../../mod/bookmarks.php:38
msgid "Bookmark added"
@@ -3599,412 +3606,16 @@ msgstr "Meine Lesezeichen"
msgid "My Connections Bookmarks"
msgstr "Lesezeichen meiner Kontakte"
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "Name wird benötigt"
-
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis werden benötigt"
-
-#: ../../mod/settings.php:79 ../../mod/settings.php:539
-msgid "Update"
-msgstr "Update"
-
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
-msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
-
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
-
-#: ../../mod/settings.php:209
-msgid "Password changed."
-msgstr "Kennwort geändert."
-
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
-msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
-
-#: ../../mod/settings.php:225
-msgid "Not valid email."
-msgstr "Keine gültige E-Mail Adresse."
-
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
-msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
-
-#: ../../mod/settings.php:237
-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:441
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
-
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-#: ../../mod/settings.php:574
-msgid "Add application"
-msgstr "Anwendung hinzufügen"
-
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Name"
-msgstr "Name"
-
-#: ../../mod/settings.php:515
-msgid "Name of application"
-msgstr "Name der Anwendung"
-
-#: ../../mod/settings.php:516 ../../mod/settings.php:542
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: ../../mod/settings.php:516 ../../mod/settings.php:517
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
-
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Redirect"
-msgstr "Umleitung"
-
-#: ../../mod/settings.php:518
-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:519 ../../mod/settings.php:545
-msgid "Icon url"
-msgstr "Symbol-URL"
-
-#: ../../mod/settings.php:519
-msgid "Optional"
-msgstr "Optional"
-
-#: ../../mod/settings.php:530
-msgid "You can't edit this application."
-msgstr "Diese Anwendung kann nicht bearbeitet werden."
-
-#: ../../mod/settings.php:573
-msgid "Connected Apps"
-msgstr "Verbundene Apps"
-
-#: ../../mod/settings.php:577
-msgid "Client key starts with"
-msgstr "Client key beginnt mit"
-
-#: ../../mod/settings.php:578
-msgid "No name"
-msgstr "Kein Name"
-
-#: ../../mod/settings.php:579
-msgid "Remove authorization"
-msgstr "Authorisierung aufheben"
-
-#: ../../mod/settings.php:590
-msgid "No feature settings configured"
-msgstr "Keine Funktions-Einstellungen konfiguriert"
-
-#: ../../mod/settings.php:598
-msgid "Feature Settings"
-msgstr "Funktions-Einstellungen"
-
-#: ../../mod/settings.php:621
-msgid "Account Settings"
-msgstr "Konto-Einstellungen"
-
-#: ../../mod/settings.php:622
-msgid "Password Settings"
-msgstr "Kennwort-Einstellungen"
-
-#: ../../mod/settings.php:623
-msgid "New Password:"
-msgstr "Neues Passwort:"
-
-#: ../../mod/settings.php:624
-msgid "Confirm:"
-msgstr "Bestätigen:"
-
-#: ../../mod/settings.php:624
-msgid "Leave password fields blank unless changing"
-msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
-
-#: ../../mod/settings.php:626 ../../mod/settings.php:921
-msgid "Email Address:"
-msgstr "Email Adresse:"
-
-#: ../../mod/settings.php:627
-msgid "Remove Account"
-msgstr "Konto entfernen"
-
-#: ../../mod/settings.php:628
-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:644
-msgid "Off"
-msgstr "Aus"
-
-#: ../../mod/settings.php:644
-msgid "On"
-msgstr "An"
-
-#: ../../mod/settings.php:651
-msgid "Additional Features"
-msgstr "Zusätzliche Funktionen"
-
-#: ../../mod/settings.php:676
-msgid "Connector Settings"
-msgstr "Connector-Einstellungen"
-
-#: ../../mod/settings.php:706 ../../mod/admin.php:379
-msgid "No special theme for mobile devices"
-msgstr "Keine spezielle Theme für mobile Geräte"
-
-#: ../../mod/settings.php:746
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../mod/settings.php:752
-msgid "Display Theme:"
-msgstr "Anzeige Theme:"
-
-#: ../../mod/settings.php:753
-msgid "Mobile Theme:"
-msgstr "Mobile Theme:"
-
-#: ../../mod/settings.php:754
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
-
-#: ../../mod/settings.php:754
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimum von 10 Sekunden, kein Maximum"
-
-#: ../../mod/settings.php:755
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
-
-#: ../../mod/settings.php:755
-msgid "Maximum of 100 items"
-msgstr "Maximum von 100 Beiträgen"
-
-#: ../../mod/settings.php:756
-msgid "Don't show emoticons"
-msgstr "Emoticons nicht zeigen"
-
-#: ../../mod/settings.php:792
-msgid "Nobody except yourself"
-msgstr "Niemand außer du selbst"
-
-#: ../../mod/settings.php:793
-msgid "Only those you specifically allow"
-msgstr "Nur die, denen du es explizit erlaubst"
-
-#: ../../mod/settings.php:794
-msgid "Anybody in your address book"
-msgstr "Jeder aus Ihrem Adressbuch"
-
-#: ../../mod/settings.php:795
-msgid "Anybody on this website"
-msgstr "Jeder auf dieser Website"
-
-#: ../../mod/settings.php:796
-msgid "Anybody in this network"
-msgstr "Jeder in diesem Netzwerk"
-
-#: ../../mod/settings.php:797
-msgid "Anybody on the internet"
-msgstr "Jeder im Internet"
-
-#: ../../mod/settings.php:874
-msgid "Publish your default profile in the network directory"
-msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
-
-#: ../../mod/settings.php:879
-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:883 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "oder"
-
-#: ../../mod/settings.php:888
-msgid "Your channel address is"
-msgstr "Deine Kanal-Adresse lautet"
-
-#: ../../mod/settings.php:910
-msgid "Channel Settings"
-msgstr "Kanal-Einstellungen"
-
-#: ../../mod/settings.php:919
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
-
-#: ../../mod/settings.php:922
-msgid "Your Timezone:"
-msgstr "Ihre Zeitzone:"
-
-#: ../../mod/settings.php:923
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
-
-#: ../../mod/settings.php:924
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
-
-#: ../../mod/settings.php:926
-msgid "Adult Content"
-msgstr "Nicht Jugendfreie-Inhalte"
-
-#: ../../mod/settings.php:926
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
-
-#: ../../mod/settings.php:928
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Datenschutz-Einstellungen"
-
-#: ../../mod/settings.php:930
-msgid "Hide my online presence"
-msgstr "Meine Online-Präsenz verbergen"
-
-#: ../../mod/settings.php:930
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Verhindert die Anzeige deines Online-Status in deinem Profil"
-
-#: ../../mod/settings.php:932
-msgid "Simple Privacy Settings:"
-msgstr "Einfache Privatsphären-Einstellungen"
-
-#: ../../mod/settings.php:933
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr ""
-
-#: ../../mod/settings.php:934
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr ""
-
-#: ../../mod/settings.php:935
-msgid "Private - <em>default private, never open or public</em>"
-msgstr ""
-
-#: ../../mod/settings.php:936
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr ""
-
-#: ../../mod/settings.php:939
-msgid "Advanced Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:941
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Kontaktanfragen pro Tag:"
-
-#: ../../mod/settings.php:941
-msgid "May reduce spam activity"
-msgstr "Kann die Spam-Aktivität verringern"
-
-#: ../../mod/settings.php:942
-msgid "Default Post Permissions"
-msgstr "Beitragszugriffrechte Standardeinstellungen"
-
-#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
-
-#: ../../mod/settings.php:954
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
-
-#: ../../mod/settings.php:954
-msgid "Useful to reduce spamming"
-msgstr "Nützlich um Spam zu verringern"
-
-#: ../../mod/settings.php:957
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
-
-#: ../../mod/settings.php:958
-msgid "By default post a status message when:"
-msgstr "Sende standardmäßig Status-Nachrichten wenn:"
-
-#: ../../mod/settings.php:959
-msgid "accepting a friend request"
-msgstr "einer Kontaktanfrage stattgegeben wurde"
-
-#: ../../mod/settings.php:960
-msgid "joining a forum/community"
-msgstr "ein Forum beigetreten wurde"
-
-#: ../../mod/settings.php:961
-msgid "making an <em>interesting</em> profile change"
-msgstr "eine <em>interessante</em> Änderung am Profil vorgenommen wurde"
-
-#: ../../mod/settings.php:962
-msgid "Send a notification email when:"
-msgstr "Eine Email Benachrichtigung senden wenn:"
-
-#: ../../mod/settings.php:963
-msgid "You receive an introduction"
-msgstr "Du eine Vorstellung erhältst"
-
-#: ../../mod/settings.php:964
-msgid "Your introductions are confirmed"
-msgstr "Deine Vorstellung bestätigt wurde."
-
-#: ../../mod/settings.php:965
-msgid "Someone writes on your profile wall"
-msgstr "Jemand auf deine Pinnwand schreibt"
-
-#: ../../mod/settings.php:966
-msgid "Someone writes a followup comment"
-msgstr "Jemand einen Beitrag kommentiert"
-
-#: ../../mod/settings.php:967
-msgid "You receive a private message"
-msgstr "Du eine private Nachricht erhältst"
-
-#: ../../mod/settings.php:968
-msgid "You receive a friend suggestion"
-msgstr "Du einen Kontaktvorschlag erhältst"
-
-#: ../../mod/settings.php:969
-msgid "You are tagged in a post"
-msgstr "Du wurdest in einem Beitrag getaggt"
-
-#: ../../mod/settings.php:970
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
-
-#: ../../mod/settings.php:973
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Account / Seiten Arten Einstellungen"
-
-#: ../../mod/settings.php:974
-msgid "Change the behaviour of this account for special situations"
-msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
-
#: ../../mod/subthread.php:105
#, php-format
msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
#: ../../mod/update_network.php:23 ../../mod/update_channel.php:43
#: ../../mod/update_search.php:46 ../../mod/update_display.php:25
#: ../../mod/update_community.php:18
msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]"
+msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
#: ../../mod/chanview.php:77 ../../mod/home.php:50 ../../mod/page.php:47
#: ../../mod/wall_upload.php:35
@@ -4018,41 +3629,41 @@ msgstr "auf Vollbildmodus umschalten"
#: ../../mod/tagger.php:98
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$s's %3$s mit %4$s getaggt"
+msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
#: ../../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."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
-#: ../../mod/chat.php:120
+#: ../../mod/chat.php:163
msgid "Leave Room"
msgstr "Raum verlassen"
-#: ../../mod/chat.php:121
+#: ../../mod/chat.php:164
msgid "I am away right now"
msgstr "Ich bin gerade nicht da"
-#: ../../mod/chat.php:122
+#: ../../mod/chat.php:165
msgid "I am online"
msgstr "Ich bin online"
-#: ../../mod/chat.php:146 ../../mod/chat.php:166
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
msgid "New Chatroom"
-msgstr "Neuen Chatraum"
+msgstr "Neuer Chatraum"
-#: ../../mod/chat.php:147
+#: ../../mod/chat.php:190
msgid "Chatroom Name"
-msgstr "Chatraum Name"
+msgstr "Name des Chatraums"
-#: ../../mod/chat.php:162
+#: ../../mod/chat.php:205
#, php-format
msgid "%1$s's Chatrooms"
-msgstr "%1$s's Chat-Räume"
+msgstr "%1$ss Chaträume"
#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
#: ../../mod/directory.php:15 ../../mod/display.php:9
#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:442
+#: ../../mod/photos.php:443
msgid "Public access denied."
msgstr "Öffentlicher Zugang verweigert."
@@ -4063,7 +3674,7 @@ msgstr "Keine Verbindungen."
#: ../../mod/viewconnections.php:55
#, php-format
msgid "Visit %s's profile [%s]"
-msgstr "Besuche %s's Profil [%s]"
+msgstr "%ss Profil [%s] besuchen"
#: ../../mod/viewconnections.php:70
msgid "View Connnections"
@@ -4075,13 +3686,13 @@ msgstr "Schlagwort entfernt"
#: ../../mod/tagrm.php:79
msgid "Remove Item Tag"
-msgstr "Schlagwort des Beitrags entfernen"
+msgstr "Schlagwort entfernen"
#: ../../mod/tagrm.php:81
msgid "Select a tag to remove: "
-msgstr "Schlagwort zum entfernen auswählen:"
+msgstr "Schlagwort zum Entfernen auswählen:"
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
msgid "Remove"
msgstr "Entferne"
@@ -4091,42 +3702,42 @@ msgstr "Fortfahren"
#: ../../mod/connect.php:84
msgid "Premium Channel Setup"
-msgstr "Prämium-Kanal Einrichtung"
+msgstr "Premium-Kanal-Einrichtung"
#: ../../mod/connect.php:86
msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für den Prämium-Kanal aktivieren"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
#: ../../mod/connect.php:87
msgid ""
"Please enter your restrictions or conditions, such as paypal receipt, usage "
"guidelines, etc."
-msgstr "Bitte gib deine Nutzungseinschränkungen ein, z.B. Paypal Quittung, Nutzungsbestimmungen etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
#: ../../mod/connect.php:89 ../../mod/connect.php:109
msgid ""
"This channel may require additional steps or acknowledgement of the "
"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen, vor dem Verbinden mit diesem Kanal nötig."
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
#: ../../mod/connect.php:90
msgid ""
"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Verbindungen werden den folgenden Text sehen bevor fortgefahren wird:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
#: ../../mod/connect.php:91 ../../mod/connect.php:112
msgid ""
"By continuing, I certify that I have complied with any instructions provided"
" on this page."
-msgstr "Mit dem fortfahren bestätige ich die Erfüllung aller Anweisungen die vom Seitenbetreiber erteilt wurden."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite."
#: ../../mod/connect.php:100
msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Seitenbetreiber hat keine speziellen Anweisungen für Kanal-Betreiber hinterlegt.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
#: ../../mod/connect.php:108
msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Prämium-Kanal"
+msgstr "Eingeschränkter oder Premium-Kanal"
#: ../../mod/delegate.php:95
msgid "No potential page delegates located."
@@ -4134,14 +3745,14 @@ msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
#: ../../mod/delegate.php:121
msgid "Delegate Page Management"
-msgstr "Delegiere das Management für die Seite"
+msgstr "Delegiere das Management für diese Seite"
#: ../../mod/delegate.php:123
msgid ""
"Delegates are able to manage all aspects of this account/page except for "
"basic account settings. Please do not delegate your personal account to "
"anybody that you do not trust completely."
-msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"
+msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
#: ../../mod/delegate.php:124
msgid "Existing Page Managers"
@@ -4233,7 +3844,11 @@ msgstr "Neues Menü-Bestandteil"
#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
msgid "Menu Item Permissions"
-msgstr "Menü-Element Zugriffsrechte"
+msgstr "Zugriffsrechte des Menü-Elements"
+
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
msgid "Link text"
@@ -4275,6 +3890,26 @@ msgstr "Menü-Bestandteil kann nicht gelöscht werden."
msgid "Edit Menu Element"
msgstr "Bearbeite Menü-Bestandteil"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
+
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
+
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
+
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Sichtbar für"
+
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Alle Verbindungen"
+
#: ../../mod/group.php:20
msgid "Collection created."
msgstr "Sammlung erstellt."
@@ -4323,26 +3958,6 @@ msgstr "Alle verbundenen Kanäle"
msgid "Click on a channel to add or remove."
msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil Identifikator"
-
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits Editor"
-
-#: ../../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:118
-msgid "Visible To"
-msgstr "Sichtbar für"
-
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
-msgstr "Alle Verbindungen"
-
#: ../../mod/admin.php:48
msgid "Theme settings updated."
msgstr "Theme-Einstellungen aktualisiert."
@@ -4381,11 +3996,11 @@ msgstr "Plug-In Funktionen"
#: ../../mod/admin.php:115
msgid "User registrations waiting for confirmation"
-msgstr "Nutzer Anmeldungen die auf Bestätigung warten"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
#: ../../mod/admin.php:189
msgid "Message queues"
-msgstr "Nachrichten Warteschlange"
+msgstr "Nachrichten-Warteschlangen"
#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
@@ -4417,9 +4032,13 @@ msgstr "Aktive Plug-Ins"
msgid "Site settings updated."
msgstr "Site-Einstellungen aktualisiert."
+#: ../../mod/admin.php:379 ../../mod/settings.php:709
+msgid "No special theme for mobile devices"
+msgstr "Keine spezielle Theme für mobile Geräte"
+
#: ../../mod/admin.php:381
msgid "No special theme for accessibility"
-msgstr "Kein spezielles Accessibility Theme vorhanden"
+msgstr "Kein spezielles Accessibility-Theme vorhanden"
#: ../../mod/admin.php:409
msgid "Closed"
@@ -4475,13 +4094,13 @@ msgstr "Banner/Logo"
#: ../../mod/admin.php:441
msgid "Administrator Information"
-msgstr "Administrator Informationen"
+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."
+msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
#: ../../mod/admin.php:442
msgid "System language"
@@ -4495,7 +4114,7 @@ msgstr "System-Theme"
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
-msgstr "Standard System-Theme - kann durch Nutzerprofile überschieben werden - <a href='#' id='cnftheme'>Theme.Einstellungen ändern</a>"
+msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
#: ../../mod/admin.php:444
msgid "Mobile system theme"
@@ -4507,11 +4126,11 @@ msgstr "Theme für mobile Geräte"
#: ../../mod/admin.php:445
msgid "Accessibility system theme"
-msgstr "Accessibility System-Theme"
+msgstr "Accessibility-System-Theme"
#: ../../mod/admin.php:445
msgid "Accessibility theme"
-msgstr "Accessibility Theme"
+msgstr "Accessibility-Theme"
#: ../../mod/admin.php:446
msgid "Channel to use for this website's static pages"
@@ -4529,11 +4148,11 @@ msgstr "Maximale Bildgröße"
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."
+msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
#: ../../mod/admin.php:449
msgid "Register policy"
-msgstr "Registrierungsmethode"
+msgstr "Registrierungsrichtlinie"
#: ../../mod/admin.php:450
msgid "Access policy"
@@ -4545,17 +4164,17 @@ msgstr "Registrierungstext"
#: ../../mod/admin.php:451
msgid "Will be displayed prominently on the registration page."
-msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
#: ../../mod/admin.php:452
msgid "Accounts abandoned after x days"
-msgstr "Accounts gelten nach X Tagen als unbenutzt"
+msgstr "Konten gelten nach X Tagen als unbenutzt"
#: ../../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."
+msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
#: ../../mod/admin.php:453
msgid "Allowed friend domains"
@@ -4586,7 +4205,7 @@ msgstr "Öffentlichen Zugriff blockieren"
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."
+msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
#: ../../mod/admin.php:456
msgid "Force publish"
@@ -4595,7 +4214,7 @@ msgstr "Veröffentlichung erzwingen"
#: ../../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."
+msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
#: ../../mod/admin.php:457
msgid "No login on Homepage"
@@ -4606,7 +4225,7 @@ 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."
+msgstr "Ktivieren, 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:459
msgid "Proxy user"
@@ -4622,7 +4241,7 @@ msgstr "Netzwerk-Timeout"
#: ../../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)."
+msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
#: ../../mod/admin.php:462
msgid "Delivery interval"
@@ -4633,7 +4252,7 @@ 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."
+msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl 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:463
msgid "Poll interval"
@@ -4643,17 +4262,17 @@ msgstr "Abfrageintervall"
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."
+msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
#: ../../mod/admin.php:464
msgid "Maximum Load Average"
-msgstr "Maximum Load Average"
+msgstr "Maximales Load Average"
#: ../../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"
+msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
#: ../../mod/admin.php:520
msgid "No server found"
@@ -4682,22 +4301,22 @@ msgstr "Update wurde als erfolgreich markiert"
#: ../../mod/admin.php:558
#, php-format
msgid "Executing %s failed. Check system logs."
-msgstr "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs."
+msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
#: ../../mod/admin.php:561
#, php-format
msgid "Update %s was successfully applied."
-msgstr "Update %s wurde erfolgreich angewandt."
+msgstr "Update %s wurde erfolgreich ausgeführt."
#: ../../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."
+msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
#: ../../mod/admin.php:568
#, php-format
msgid "Update function %s could not be found."
-msgstr "Update Funktion %s konnte nicht gefunden werden."
+msgstr "Update-Funktion %s konnte nicht gefunden werden."
#: ../../mod/admin.php:583
msgid "No failed updates."
@@ -4709,11 +4328,11 @@ msgstr "Fehlgeschlagene Aktualisierungen"
#: ../../mod/admin.php:589
msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)"
+msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
#: ../../mod/admin.php:590
msgid "Attempt to execute this update step automatically"
-msgstr "Versuche diesen Updateschritt automatisch anzuwenden"
+msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
#: ../../mod/admin.php:616
#, php-format
@@ -4754,7 +4373,7 @@ msgstr "Alle auswählen"
#: ../../mod/admin.php:740
msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
#: ../../mod/admin.php:741
msgid "Request date"
@@ -4802,13 +4421,13 @@ msgstr "Service-Klasse"
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?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"
#: ../../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?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
#: ../../mod/admin.php:794
#, php-format
@@ -4875,7 +4494,7 @@ msgstr "Protokolldatei"
#: ../../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."
+msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
#: ../../mod/admin.php:1173
msgid "Log level"
@@ -4883,7 +4502,7 @@ msgstr "Protokollstufe"
#: ../../mod/filer.php:35
msgid "- select -"
-msgstr "-auswählen-"
+msgstr "– auswählen –"
#: ../../mod/home.php:89
#, php-format
@@ -4918,38 +4537,38 @@ msgstr "Vorbis [.ogg]-Video einfügen"
msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis [.ogg]-Audio einfügen"
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
#: ../../mod/dirprofile.php:98
msgid "Age: "
msgstr "Alter:"
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
msgid "Gender: "
msgstr "Geschlecht:"
-#: ../../mod/directory.php:207
+#: ../../mod/directory.php:208
msgid "Finding:"
msgstr "Ergebnisse:"
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:216
msgid "next page"
msgstr "nächste Seite"
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:216
msgid "previous page"
msgstr "vorige Seite"
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:223
msgid "No entries (some entries may be hidden)."
msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
#: ../../mod/connedit.php:49 ../../mod/connections.php:37
msgid "Could not access contact record."
-msgstr "Konnte auf den Kontakteintrag nicht zugreifen."
+msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
#: ../../mod/connedit.php:63 ../../mod/connections.php:51
msgid "Could not locate selected profile."
-msgstr "Konnte das gewählte Profil nicht finden."
+msgstr "Gewähltes Profil nicht gefunden."
#: ../../mod/connedit.php:107 ../../mod/connections.php:94
msgid "Connection updated."
@@ -4961,7 +4580,7 @@ msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
#: ../../mod/connedit.php:204
msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Eintrag im Adressbuch zugreifen."
+msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
#: ../../mod/connedit.php:218
msgid "Refresh failed - channel is currently unavailable."
@@ -4979,7 +4598,7 @@ msgstr "Kanal blockiert"
#: ../../mod/connedit.php:254 ../../mod/connedit.php:266
#: ../../mod/connedit.php:281
msgid "Unable to set address book parameters."
-msgstr "Konnte die Adressbuch Parameter nicht setzen."
+msgstr "Konnte die Adressbuch-Parameter nicht setzen."
#: ../../mod/connedit.php:237
msgid "Channel has been unignored"
@@ -5020,11 +4639,11 @@ msgstr "Kontakt wurde entfernt."
#: ../../mod/connedit.php:315
#, php-format
msgid "View %s's profile"
-msgstr "%s's Profil ansehen"
+msgstr "%ss Profil ansehen"
#: ../../mod/connedit.php:319
msgid "Refresh Permissions"
-msgstr "Zugriffsrechte auffrischen"
+msgstr "Zugriffsrechte neu laden"
#: ../../mod/connedit.php:322
msgid "Fetch updated permissions"
@@ -5040,7 +4659,7 @@ msgstr "Betrachte die neuesten Beiträge und Kommentare"
#: ../../mod/connedit.php:336
msgid "Block or Unblock this connection"
-msgstr "Verbindung blockieren oder frei geben"
+msgstr "Verbindung blockieren oder freigeben"
#: ../../mod/connedit.php:340 ../../mod/connedit.php:476
msgid "Unignore"
@@ -5065,19 +4684,19 @@ msgstr "Archivieren"
#: ../../mod/connedit.php:349
msgid "Archive or Unarchive this connection"
-msgstr "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück"
+msgstr "Verbindung archivieren oder aus dem Archiv zurückholen"
#: ../../mod/connedit.php:352
msgid "Unhide"
-msgstr "aufdecken"
+msgstr "Wieder sichtbar machen"
#: ../../mod/connedit.php:352
msgid "Hide"
-msgstr "Verbergen"
+msgstr "Verstecken"
#: ../../mod/connedit.php:355
msgid "Hide or Unhide this connection"
-msgstr "Diese Verbindung verstecken oder aufdecken"
+msgstr "Diese Verbindung verstecken oder wieder sichtbar machen"
#: ../../mod/connedit.php:362
msgid "Delete this connection"
@@ -5093,7 +4712,7 @@ msgstr "Verbindung genehmigen"
#: ../../mod/connedit.php:405
msgid "Accept connection to allow communication"
-msgstr "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen"
+msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
#: ../../mod/connedit.php:421
msgid "Automatic Permissions Settings"
@@ -5109,25 +4728,25 @@ msgid ""
"When receiving a channel introduction, any permissions provided here will be"
" applied to the new connection automatically and the introduction approved. "
"Leave this page if you do not wish to use this feature."
-msgstr "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest."
+msgstr "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest."
#: ../../mod/connedit.php:427
msgid "Slide to adjust your degree of friendship"
-msgstr "Schieben um den Grad der Freundschaft zu wählen"
+msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
#: ../../mod/connedit.php:433
msgid "inherited"
-msgstr "Geerbt"
+msgstr "geerbt"
#: ../../mod/connedit.php:435
msgid "Connection has no individual permissions!"
-msgstr "Diese Verbindung hat keine individuellen Zugriffseinstellungen."
+msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
#: ../../mod/connedit.php:436
msgid ""
"This may be appropriate based on your <a href=\"settings\">privacy "
"settings</a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Abhängig von deinen <a href=\"settings\">Privatsphären Einstellungen</a> könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen."
+msgstr "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
#: ../../mod/connedit.php:438
msgid "Profile Visibility"
@@ -5138,7 +4757,7 @@ msgstr "Sichtbarkeit des Profils"
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
#: ../../mod/connedit.php:440
msgid "Contact Information / Notes"
@@ -5146,7 +4765,7 @@ msgstr "Kontaktinformationen / Notizen"
#: ../../mod/connedit.php:441
msgid "Edit contact notes"
-msgstr "Kontaktnotizen editieren"
+msgstr "Kontaktnotizen bearbeiten"
#: ../../mod/connedit.php:443
msgid "Their Settings"
@@ -5166,19 +4785,19 @@ msgstr "Marktschreier"
#: ../../mod/connedit.php:448
msgid "Full Sharing (typical social network permissions)"
-msgstr ""
+msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
#: ../../mod/connedit.php:449
msgid "Cautious Sharing "
-msgstr ""
+msgstr "Vorsichtiges Teilen"
#: ../../mod/connedit.php:450
msgid "Follow Only"
-msgstr "Nur Folgen"
+msgstr "Nur folgen"
#: ../../mod/connedit.php:451
msgid "Individual Permissions"
-msgstr "Individuelle Zugriffseinstellungen"
+msgstr "Individuelle Zugriffsrechte"
#: ../../mod/connedit.php:452
msgid ""
@@ -5186,24 +4805,24 @@ msgid ""
"href=\"settings\">privacy settings</a>, which have higher priority than "
"individual settings. Changing those inherited settings on this page will "
"have no effect."
-msgstr ""
+msgstr "Einige Berechtigungen werden von den <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
#: ../../mod/connedit.php:453
msgid "Advanced Permissions"
-msgstr "Erweiterte Zugriffsrechte"
+msgstr "Zugriffsrechte für Fortgeschrittene"
#: ../../mod/connedit.php:454
msgid "Simple Permissions (select one and submit)"
-msgstr ""
+msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
#: ../../mod/connedit.php:458
#, php-format
msgid "Visit %s's profile - %s"
-msgstr "%s's Profil besuchen - %s"
+msgstr "%ss Profil besuchen - %s"
#: ../../mod/connedit.php:459
msgid "Block/Unblock contact"
-msgstr "Geblockt Status ein- / ausschalten"
+msgstr "Kontakt blockieren/freigeben"
#: ../../mod/connedit.php:460
msgid "Ignore contact"
@@ -5211,7 +4830,7 @@ msgstr "Kontakt ignorieren"
#: ../../mod/connedit.php:461
msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
+msgstr "URL-Einstellungen reparieren"
#: ../../mod/connedit.php:462
msgid "View conversations"
@@ -5260,15 +4879,15 @@ msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>können</stron
#: ../../mod/layouts.php:52
msgid "Layout Help"
-msgstr "Layout Hilfe"
+msgstr "Layout-Hilfe"
#: ../../mod/layouts.php:55
msgid "Help with this feature"
-msgstr "Hilfe zu diesem Feature"
+msgstr "Hilfe zu dieser Funktion"
#: ../../mod/layouts.php:74
msgid "Layout Name"
-msgstr "Layout Name"
+msgstr "Layout-Name"
#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
msgid "Help:"
@@ -5358,11 +4977,11 @@ msgstr "Romantische Partner"
#: ../../mod/profiles.php:302
msgid "Likes"
-msgstr "Gefällt-mir"
+msgstr "Gefällt"
#: ../../mod/profiles.php:306
msgid "Dislikes"
-msgstr "Gefällt-mir-nicht"
+msgstr "Gefällt nicht"
#: ../../mod/profiles.php:310
msgid "Work/Employment"
@@ -5374,7 +4993,7 @@ msgstr "Religion"
#: ../../mod/profiles.php:317
msgid "Political Views"
-msgstr "Politische Anscihten"
+msgstr "Politische Ansichten"
#: ../../mod/profiles.php:321
msgid "Gender"
@@ -5406,7 +5025,7 @@ msgstr "Profil aktualisiert."
#: ../../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"
+msgstr "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?"
#: ../../mod/profiles.php:505
msgid "Edit Profile Details"
@@ -5442,7 +5061,7 @@ msgstr "Dein voller Name:"
#: ../../mod/profiles.php:514
msgid "Title/Description:"
-msgstr "Titel/Beschreibung:"
+msgstr "Titel/Stellenbeschreibung:"
#: ../../mod/profiles.php:515
msgid "Your Gender:"
@@ -5471,7 +5090,7 @@ msgstr "Land:"
#: ../../mod/profiles.php:521
msgid "Region/State:"
-msgstr "Region/Bundesstaat"
+msgstr "Region/Bundesstaat:"
#: ../../mod/profiles.php:522
msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
@@ -5503,15 +5122,15 @@ msgstr "Schlüsselwörter:"
#: ../../mod/profiles.php:534
msgid "Example: fishing photography software"
-msgstr "Beispiel: fischen Fotografie Software"
+msgstr "Beispiel: Angeln Fotografie Software"
#: ../../mod/profiles.php:535
msgid "Used in directory listings"
-msgstr "Wird in Verzeichnis Auflistungen verwendet"
+msgstr "Wird in Verzeichnis-Auflistungen verwendet"
#: ../../mod/profiles.php:536
msgid "Tell us about yourself..."
-msgstr "Erzähl uns ein wenig von Dir..."
+msgstr "Erzähle uns ein wenig von Dir …"
#: ../../mod/profiles.php:537
msgid "Hobbies/Interests"
@@ -5557,7 +5176,7 @@ msgstr "Schule/Ausbildung"
msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet."
-msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden im Internet sichtbar sein."
+msgstr "Das ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden im Internet sichtbar sein."
#: ../../mod/profiles.php:600
msgid "Edit/Manage Profiles"
@@ -5569,7 +5188,7 @@ msgstr "Profil-Dinge hinzufügen"
#: ../../mod/profiles.php:602
msgid "Include desirable objects in your profile"
-msgstr "binde begehrenswerte Dinge in dein Profil ein"
+msgstr "Binde begehrenswerte Dinge in Dein Profil ein"
#: ../../mod/follow.php:25
msgid "Channel added."
@@ -5579,7 +5198,7 @@ msgstr "Kanal hinzugefügt."
msgid ""
"Remote authentication blocked. You are logged into this site locally. Please"
" logout and retry."
-msgstr "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
#: ../../mod/post.php:256
#, php-format
@@ -5608,7 +5227,7 @@ msgstr "*"
#: ../../mod/sources.php:89
msgid "Manage remote sources of content for your channel."
-msgstr "Entfernte Quellen von Inhalten deines Kanals verwalten."
+msgstr "Quellen von Inhalten Deines Kanals verwalten."
#: ../../mod/sources.php:90 ../../mod/sources.php:100
msgid "New Source"
@@ -5622,11 +5241,11 @@ msgstr "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen
#: ../../mod/sources.php:102 ../../mod/sources.php:134
msgid "Only import content with these words (one per line)"
-msgstr "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
+msgstr "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten"
#: ../../mod/sources.php:102 ../../mod/sources.php:134
msgid "Leave blank to import all public content"
-msgstr "Leer lassen um alle öffentlichen Beiträge zu importieren"
+msgstr "Leer lassen, um alle öffentlichen Beiträge zu importieren"
#: ../../mod/sources.php:103 ../../mod/sources.php:137
#: ../../mod/new_channel.php:110
@@ -5655,7 +5274,7 @@ msgstr "Konnte die Quelle nicht löschen."
#: ../../mod/lockview.php:34
msgid "Remote privacy information not available."
-msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
#: ../../mod/lockview.php:43
msgid "Visible to:"
@@ -5677,7 +5296,7 @@ msgstr "Kann nicht mit der Datenbank verbinden."
msgid ""
"Could not connect to specified site URL. Possible SSL certificate or DNS "
"issue."
-msgstr "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS."
+msgstr "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."
#: ../../mod/setup.php:176
msgid "Could not create table."
@@ -5685,13 +5304,13 @@ msgstr "Kann Tabelle nicht erstellen."
#: ../../mod/setup.php:182
msgid "Your site database has been installed."
-msgstr "Die Datenbank deiner Seite wurde installiert."
+msgstr "Die Datenbank Deines Servers wurde installiert."
#: ../../mod/setup.php:187
msgid ""
"You may need to import the file \"install/database.sql\" manually using "
"phpmyadmin or mysql."
-msgstr "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren."
+msgstr "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren."
#: ../../mod/setup.php:188 ../../mod/setup.php:257 ../../mod/setup.php:609
msgid "Please see the file \"install/INSTALL.txt\"."
@@ -5713,19 +5332,19 @@ msgstr "Datenbank Verbindung"
msgid ""
"In order to install Red Matrix we need to know how to connect to your "
"database."
-msgstr "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können."
+msgstr "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."
#: ../../mod/setup.php:283
msgid ""
"Please contact your hosting provider or site administrator if you have "
"questions about these settings."
-msgstr "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest."
+msgstr "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."
#: ../../mod/setup.php:284
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
-msgstr "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst."
+msgstr "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."
#: ../../mod/setup.php:288
msgid "Database Server Name"
@@ -5741,7 +5360,7 @@ msgstr "Datenbank-Port"
#: ../../mod/setup.php:289
msgid "Communication port number - use 0 for default"
-msgstr "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:"
+msgstr "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung"
#: ../../mod/setup.php:290
msgid "Database Login Name"
@@ -5763,11 +5382,11 @@ msgstr "E-Mail Adresse des Seiten-Administrators"
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
-msgstr "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst."
+msgstr "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst."
#: ../../mod/setup.php:295 ../../mod/setup.php:338
msgid "Website URL"
-msgstr "Webseiten URL"
+msgstr "Server-URL"
#: ../../mod/setup.php:295 ../../mod/setup.php:338
msgid "Please use SSL (https) URL if available."
@@ -5775,7 +5394,7 @@ msgstr "Nutze wenn möglich eine SSL-URL (https)."
#: ../../mod/setup.php:298 ../../mod/setup.php:341
msgid "Please select a default timezone for your website"
-msgstr "Standard-Zeitzone für deine Website"
+msgstr "Standard-Zeitzone für Deinen Server"
#: ../../mod/setup.php:325
msgid "Site settings"
@@ -5783,13 +5402,13 @@ msgstr "Seiteneinstellungen"
#: ../../mod/setup.php:384
msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden."
+msgstr "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden."
#: ../../mod/setup.php:385
msgid ""
"If you don't have a command line version of PHP installed on server, you "
"will not be able to run background polling via cron."
-msgstr "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen."
+msgstr "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen."
#: ../../mod/setup.php:389
msgid "PHP executable path"
@@ -5799,7 +5418,7 @@ msgstr "PHP Pfad zu ausführbarer Datei"
msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
-msgstr "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren."
+msgstr "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren."
#: ../../mod/setup.php:394
msgid "Command line PHP"
@@ -5809,11 +5428,11 @@ msgstr "PHP Befehlszeile"
msgid ""
"The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled."
-msgstr "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert."
+msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert."
#: ../../mod/setup.php:404
msgid "This is required for message delivery to work."
-msgstr "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
#: ../../mod/setup.php:406
msgid "PHP register_argc_argv"
@@ -5823,13 +5442,13 @@ msgstr "PHP register_argc_argv"
msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys"
-msgstr "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen."
+msgstr "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen."
#: ../../mod/setup.php:428
msgid ""
"If running under Windows, please see "
"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Wenn du Windows verwendest, siehe http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung."
+msgstr "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung."
#: ../../mod/setup.php:430
msgid "Generate encryption keys"
@@ -5837,36 +5456,36 @@ msgstr "Verschlüsselungsschlüssel generieren"
#: ../../mod/setup.php:437
msgid "libCurl PHP module"
-msgstr "libCurl PHP Modul"
+msgstr "libCurl-PHP-Modul"
#: ../../mod/setup.php:438
msgid "GD graphics PHP module"
-msgstr "GD Graphik PHP Modul"
+msgstr "GD-Grafik-PHP-Modul"
#: ../../mod/setup.php:439
msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP Modul"
+msgstr "OpenSSL-PHP-Modul"
#: ../../mod/setup.php:440
msgid "mysqli PHP module"
-msgstr "mysqli PHP Modul"
+msgstr "mysqli-PHP-Modul"
#: ../../mod/setup.php:441
msgid "mb_string PHP module"
-msgstr "mb_string PHP Modul"
+msgstr "mb_string-PHP-Modul"
#: ../../mod/setup.php:442
msgid "mcrypt PHP module"
-msgstr "mcrypt PHP Modul"
+msgstr "mcrypt-PHP-Modul"
#: ../../mod/setup.php:447 ../../mod/setup.php:449
msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite Modul"
+msgstr "Apache-mod_rewrite-Modul"
#: ../../mod/setup.php:447
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:453 ../../mod/setup.php:456
msgid "proc_open"
@@ -5876,56 +5495,56 @@ msgstr "proc_open"
msgid ""
"Error: proc_open is required but is either not installed or has been "
"disabled in php.ini"
-msgstr "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
#: ../../mod/setup.php:461
msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:465
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:469
msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:473
msgid "Error: mysqli PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:477
msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:481
msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:497
msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\""
" in the top folder of your web server and it is unable to do so."
-msgstr "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht."
+msgstr "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht."
#: ../../mod/setup.php:498
msgid ""
"This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can."
-msgstr "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst."
+msgstr "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst."
#: ../../mod/setup.php:499
msgid ""
"At the end of this procedure, we will give you a text to save in a file "
"named .htconfig.php in your Red top folder."
-msgstr "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern."
+msgstr "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst."
#: ../../mod/setup.php:500
msgid ""
"You can alternatively skip this procedure and perform a manual installation."
" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
+msgstr "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt."
#: ../../mod/setup.php:503
msgid ".htconfig.php is writable"
@@ -5935,26 +5554,26 @@ msgstr ".htconfig.php ist beschreibbar"
msgid ""
"Red uses the Smarty3 template engine to render its web views. Smarty3 "
"compiles templates to PHP to speed up rendering."
-msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen."
+msgstr "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen."
#: ../../mod/setup.php:514
msgid ""
"In order to store these compiled templates, the web server needs to have "
"write access to the directory view/tpl/smarty3/ under the Red top level "
"folder."
-msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben."
+msgstr "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben."
#: ../../mod/setup.php:515 ../../mod/setup.php:533
msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has"
" write access to this folder."
-msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat."
+msgstr "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat."
#: ../../mod/setup.php:516
msgid ""
"Note: as a security measure, you should give the web server write access to "
"view/tpl/smarty3/ only--not the template files (.tpl) that it contains."
-msgstr "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen."
+msgstr "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ ."
#: ../../mod/setup.php:519
msgid "view/tpl/smarty3 is writable"
@@ -5964,7 +5583,7 @@ msgstr "view/tpl/smarty3 ist beschreibbar"
msgid ""
"Red uses the store directory to save uploaded files. The web server needs to"
" have write access to the store directory under the Red top level folder"
-msgstr "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis."
+msgstr "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses"
#: ../../mod/setup.php:536
msgid "store is writable"
@@ -5978,12 +5597,12 @@ msgstr "SSL Zertifikatverifizierung"
msgid ""
"SSL certificate cannot be validated. Fix certificate or disable https access"
" to this site."
-msgstr "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen."
+msgstr "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server."
#: ../../mod/setup.php:558
msgid ""
"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration."
+msgstr "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration."
#: ../../mod/setup.php:560
msgid "Url rewrite is working"
@@ -5994,11 +5613,11 @@ msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
-msgstr "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
+msgstr "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen."
#: ../../mod/setup.php:594
msgid "Errors encountered creating database tables."
-msgstr "Fehler während des Anlegens der Datenbank Tabellen aufgetreten."
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
#: ../../mod/setup.php:607
msgid "<h1>What next</h1>"
@@ -6008,7 +5627,7 @@ msgstr "<h1>Was als Nächstes</h1>"
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the "
"poller."
-msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
+msgstr "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten."
#: ../../mod/siteinfo.php:57
#, php-format
@@ -6023,37 +5642,56 @@ msgstr "Installierte Plugins/Addons/Apps"
msgid "No installed plugins/addons/apps"
msgstr "Keine installierten Plugins/Addons/Apps"
-#: ../../mod/siteinfo.php:109
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
+msgstr "Projekt Spenden"
+
+#: ../../mod/siteinfo.php:94
+msgid ""
+"<p>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</p>"
+msgstr ""
+
+#: ../../mod/siteinfo.php:95
+msgid "<p>or</p>"
+msgstr "<p>oder</p>"
+
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
+msgstr ""
+
+#: ../../mod/siteinfo.php:115
msgid "Red"
msgstr "Red"
-#: ../../mod/siteinfo.php:110
+#: ../../mod/siteinfo.php:116
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:113
+#: ../../mod/siteinfo.php:119
msgid "Running at web location"
msgstr "Erreichbar unter der Web-Adresse"
-#: ../../mod/siteinfo.php:114
+#: ../../mod/siteinfo.php:120
msgid ""
"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
"about the Red Matrix."
-msgstr "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren."
+msgstr "Besuche <a href=\"http://getzot.com\">GetZot.com</a>, um mehr über die Red-Matrix zu erfahren."
-#: ../../mod/siteinfo.php:115
+#: ../../mod/siteinfo.php:121
msgid "Bug reports and issues: please visit"
msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-#: ../../mod/siteinfo.php:118
+#: ../../mod/siteinfo.php:124
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
"com"
msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-#: ../../mod/siteinfo.php:120
+#: ../../mod/siteinfo.php:126
msgid "Site Administrators"
msgstr "Administratoren"
@@ -6067,25 +5705,25 @@ msgid ""
" to hold social network profiles, blogs, conversation groups and forums, "
"celebrity pages, and much more. You may create as many channels as your "
"service provider allows."
-msgstr "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt."
+msgstr "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt."
#: ../../mod/new_channel.php:111
msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
#: ../../mod/new_channel.php:112
msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznahmen"
+msgstr "Wähle einen kurzen Spitznamen"
#: ../../mod/new_channel.php:113
msgid ""
"Your nickname will be used to create an easily remembered channel address "
"(like an email address) which you can share with others."
-msgstr "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst."
#: ../../mod/new_channel.php:114
msgid "Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Ort"
+msgstr "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server"
#: ../../mod/lostpass.php:15
msgid "No valid account found."
@@ -6093,23 +5731,23 @@ msgstr "Kein gültiges Konto gefunden."
#: ../../mod/lostpass.php:29
msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
#, php-format
msgid "Site Member (%s)"
-msgstr "Seiten Mitglied (%s)"
+msgstr "Nutzer (%s)"
#: ../../mod/lostpass.php:40
#, php-format
msgid "Password reset requested at %s"
-msgstr "Passwort Rücksetzung auf %s angefordert"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
#: ../../mod/lostpass.php:63
msgid ""
"Request could not be verified. (You may have previously submitted it.) "
"Password reset failed."
-msgstr "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen."
+msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
#: ../../mod/lostpass.php:85 ../../boot.php:1434
msgid "Password Reset"
@@ -6125,7 +5763,7 @@ msgstr "Dein neues Passwort lautet"
#: ../../mod/lostpass.php:88
msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere dein neues Passwort - und dann"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
#: ../../mod/lostpass.php:89
msgid "click here to login"
@@ -6140,7 +5778,7 @@ msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen
#: ../../mod/lostpass.php:107
#, php-format
msgid "Your password has changed at %s"
-msgstr "Auf %s wurde dein Passwort geändert"
+msgstr "Auf %s wurde Dein Passwort geändert"
#: ../../mod/lostpass.php:122
msgid "Forgot your Password?"
@@ -6150,7 +5788,7 @@ msgstr "Kennwort vergessen?"
msgid ""
"Enter your email address and submit to have your password reset. Then check "
"your email for further instructions."
-msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
#: ../../mod/lostpass.php:124
msgid "Email Address"
@@ -6160,6 +5798,407 @@ msgstr "E-Mail Adresse"
msgid "Reset"
msgstr "Zurücksetzen"
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Name ist erforderlich"
+
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Schlüssel und Geheimnis werden benötigt"
+
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
+msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
+
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
+
+#: ../../mod/settings.php:212
+msgid "Password changed."
+msgstr "Kennwort geändert."
+
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
+msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
+
+#: ../../mod/settings.php:228
+msgid "Not valid email."
+msgstr "Keine gültige E-Mail Adresse."
+
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
+msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
+
+#: ../../mod/settings.php:240
+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:444
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
+msgstr "Anwendung hinzufügen"
+
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
+msgstr "Name"
+
+#: ../../mod/settings.php:518
+msgid "Name of application"
+msgstr "Name der Anwendung"
+
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
+
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
+msgstr "Umleitung"
+
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert"
+
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
+msgstr "Symbol-URL"
+
+#: ../../mod/settings.php:522
+msgid "Optional"
+msgstr "Optional"
+
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
+msgstr "Diese Anwendung kann nicht bearbeitet werden."
+
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
+msgstr "Verbundene Apps"
+
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
+msgstr "Client key beginnt mit"
+
+#: ../../mod/settings.php:581
+msgid "No name"
+msgstr "Kein Name"
+
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
+msgstr "Authorisierung aufheben"
+
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
+msgstr "Keine Funktions-Einstellungen konfiguriert"
+
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
+msgstr "Funktions-Einstellungen"
+
+#: ../../mod/settings.php:624
+msgid "Account Settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../mod/settings.php:625
+msgid "Password Settings"
+msgstr "Kennwort-Einstellungen"
+
+#: ../../mod/settings.php:626
+msgid "New Password:"
+msgstr "Neues Passwort:"
+
+#: ../../mod/settings.php:627
+msgid "Confirm:"
+msgstr "Bestätigen:"
+
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
+msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
+
+#: ../../mod/settings.php:629 ../../mod/settings.php:925
+msgid "Email Address:"
+msgstr "Email Adresse:"
+
+#: ../../mod/settings.php:630
+msgid "Remove Account"
+msgstr "Konto entfernen"
+
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
+
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr "Aus"
+
+#: ../../mod/settings.php:647
+msgid "On"
+msgstr "An"
+
+#: ../../mod/settings.php:654
+msgid "Additional Features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Connector-Einstellungen"
+
+#: ../../mod/settings.php:750
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
+msgstr "Anzeige-Theme:"
+
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
+msgstr "Mobile Theme:"
+
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
+
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimum 10 Sekunden, kein Maximum"
+
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
+
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
+msgstr "Maximum: 100 Beiträge"
+
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
+msgstr "Emoticons nicht zeigen"
+
+#: ../../mod/settings.php:761
+msgid "View remote profiles as webpages"
+msgstr ""
+
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
+msgstr ""
+
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
+msgstr "Niemand außer Dir selbst"
+
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
+msgstr "Nur die, denen Du es explizit erlaubst"
+
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
+msgstr "Jeder aus Ihrem Adressbuch"
+
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
+msgstr "Jeder auf dieser Website"
+
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
+msgstr "Jeder in diesem Netzwerk"
+
+#: ../../mod/settings.php:801
+msgid "Anybody on the internet"
+msgstr "Jeder im Internet"
+
+#: ../../mod/settings.php:878
+msgid "Publish your default profile in the network directory"
+msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
+
+#: ../../mod/settings.php:883
+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:887 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "oder"
+
+#: ../../mod/settings.php:892
+msgid "Your channel address is"
+msgstr "Deine Kanal-Adresse lautet"
+
+#: ../../mod/settings.php:914
+msgid "Channel Settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../mod/settings.php:923
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
+
+#: ../../mod/settings.php:926
+msgid "Your Timezone:"
+msgstr "Ihre Zeitzone:"
+
+#: ../../mod/settings.php:927
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
+
+#: ../../mod/settings.php:928
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
+
+#: ../../mod/settings.php:930
+msgid "Adult Content"
+msgstr "Nicht jugendfreie Inhalte"
+
+#: ../../mod/settings.php:930
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
+
+#: ../../mod/settings.php:932
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Datenschutz-Einstellungen"
+
+#: ../../mod/settings.php:934
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
+
+#: ../../mod/settings.php:934
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
+
+#: ../../mod/settings.php:936
+msgid "Simple Privacy Settings:"
+msgstr "Einfache Privatsphäre-Einstellungen"
+
+#: ../../mod/settings.php:937
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
+
+#: ../../mod/settings.php:938
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Typisch – <em>Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
+
+#: ../../mod/settings.php:939
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Private – <em>Default privat, nie offen oder öffentlich</em>"
+
+#: ../../mod/settings.php:940
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Blockiert – <em>Alle per Default blockiert</em>"
+
+#: ../../mod/settings.php:943
+msgid "Advanced Privacy Settings"
+msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
+
+#: ../../mod/settings.php:945
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Kontaktanfragen pro Tag:"
+
+#: ../../mod/settings.php:945
+msgid "May reduce spam activity"
+msgstr "Kann die Spam-Aktivität verringern"
+
+#: ../../mod/settings.php:946
+msgid "Default Post Permissions"
+msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
+
+#: ../../mod/settings.php:958
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
+
+#: ../../mod/settings.php:958
+msgid "Useful to reduce spamming"
+msgstr "Nützlich, um Spam zu verringern"
+
+#: ../../mod/settings.php:961
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
+
+#: ../../mod/settings.php:962
+msgid "By default post a status message when:"
+msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
+
+#: ../../mod/settings.php:963
+msgid "accepting a friend request"
+msgstr "Du eine Kontaktanfrage annimmst"
+
+#: ../../mod/settings.php:964
+msgid "joining a forum/community"
+msgstr "Du einem Forum beitrittst"
+
+#: ../../mod/settings.php:965
+msgid "making an <em>interesting</em> profile change"
+msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
+
+#: ../../mod/settings.php:966
+msgid "Send a notification email when:"
+msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
+
+#: ../../mod/settings.php:967
+msgid "You receive an introduction"
+msgstr "Du eine Vorstellung erhältst"
+
+#: ../../mod/settings.php:968
+msgid "Your introductions are confirmed"
+msgstr "Deine Vorstellung bestätigt wurde."
+
+#: ../../mod/settings.php:969
+msgid "Someone writes on your profile wall"
+msgstr "Jemand auf Deine Pinnwand schreibt"
+
+#: ../../mod/settings.php:970
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Beitrag kommentiert"
+
+#: ../../mod/settings.php:971
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhältst"
+
+#: ../../mod/settings.php:972
+msgid "You receive a friend suggestion"
+msgstr "Du einen Kontaktvorschlag erhältst"
+
+#: ../../mod/settings.php:973
+msgid "You are tagged in a post"
+msgstr "Du in einem Beitrag erwähnt wurdest"
+
+#: ../../mod/settings.php:974
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
+
+#: ../../mod/settings.php:977
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Account- und Seitenart-Einstellungen"
+
+#: ../../mod/settings.php:978
+msgid "Change the behaviour of this account for special situations"
+msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
+
+#: ../../mod/settings.php:981
+msgid ""
+"Please enable expert mode (in Settings > Additional features) to adjust!"
+msgstr ""
+
#: ../../mod/import.php:36
msgid "Nothing to import."
msgstr "Nichts zu importieren."
@@ -6175,7 +6214,7 @@ msgstr "Die importierte Datei ist leer."
#: ../../mod/import.php:88
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen."
+msgstr "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen."
#: ../../mod/import.php:106
msgid "Channel clone failed. Import failed."
@@ -6203,7 +6242,7 @@ msgid ""
" may retrieve the channel identity from the old server/hub via the network "
"or provide an export file. Only identity and connections/relationships will "
"be imported. Importation of content is not yet available."
-msgstr "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
+msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Red-Server zu importieren. Du kannst den Kanal direkt vom bisherigen Red-Server über das Netzwerk importieren oder eine exportierte Sicherheitskopie benutzen. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich."
#: ../../mod/import.php:378
msgid "File to Upload"
@@ -6211,11 +6250,11 @@ msgstr "Hochzuladende Datei:"
#: ../../mod/import.php:379
msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Deteils deines alten Server/Hubs an"
+msgstr "Oder gib die Details Deines bisherigen Red-Servers ein"
#: ../../mod/import.php:380
msgid "Your old identity address (xyz@example.com)"
-msgstr "Die alte Adresse der Identität (xyz@example.com)"
+msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
#: ../../mod/import.php:381
msgid "Your old login email address"
@@ -6231,16 +6270,16 @@ msgid ""
"address, or whether your old location should continue this role. You will be"
" able to post from either location, but only one can be marked as the "
"primary location for files, photos, and media."
-msgstr "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein."
+msgstr "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
#: ../../mod/import.php:384
msgid "Make this hub my primary location"
-msgstr "Dieser Hub ist mein primärer Server."
+msgstr "Dieser Red-Server ist mein primärer Server."
#: ../../mod/manage.php:63
#, php-format
msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet."
+msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
#: ../../mod/manage.php:71
msgid "Create a new channel"
@@ -6256,7 +6295,7 @@ msgstr "Aktueller Kanal"
#: ../../mod/manage.php:79
msgid "Attach to one of your channels by selecting it."
-msgstr "Wähle einen deiner Kanäle aus um ihn zu verwenden."
+msgstr "Wähle einen Deiner Kanäle aus, um ihn zu verwenden."
#: ../../mod/manage.php:80
msgid "Default Channel"
@@ -6272,7 +6311,7 @@ msgstr "Stimmen gesamt"
#: ../../mod/vote.php:98
msgid "Average Rating"
-msgstr "durchschnittliche Bewertung"
+msgstr "Durchschnittliche Bewertung"
#: ../../mod/match.php:16
msgid "Profile Match"
@@ -6280,7 +6319,7 @@ msgstr "Profil-Übereinstimmungen"
#: ../../mod/match.php:24
msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu."
+msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
#: ../../mod/match.php:61
msgid "is interested in:"
@@ -6344,7 +6383,7 @@ msgstr "Nachricht löschen"
#: ../../mod/mail.php:293
msgid "Recall message"
-msgstr "Widerrufe die Nachricht"
+msgstr "Nachricht widerrufen"
#: ../../mod/mail.php:295
msgid "Message has been recalled."
@@ -6362,7 +6401,7 @@ msgstr "Unterhaltung löschen"
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
-msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst du von der Profilseite des Absenders antworten."
+msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
#: ../../mod/mail.php:322
msgid "Send Reply"
@@ -6382,7 +6421,7 @@ msgstr "Layout löschen"
#: ../../mod/profile_photo.php:44
msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das zurecht schneiden schlug fehl."
+msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
#: ../../mod/profile_photo.php:97
msgid "Image resize failed."
@@ -6392,7 +6431,7 @@ msgstr "Bild-Anpassung fehlgeschlagen."
msgid ""
"Shift-reload the page or clear browser cache if the new photo does not "
"display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden sollte das neue Foto nicht sofort angezeigt werden."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
#: ../../mod/profile_photo.php:163
#, php-format
@@ -6437,7 +6476,7 @@ msgstr "Bild zuschneiden"
#: ../../mod/profile_photo.php:303
msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Bitte passe das Bild zur optimalen Anzeige an."
+msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
#: ../../mod/profile_photo.php:305
msgid "Done Editing"
@@ -6482,7 +6521,7 @@ msgstr "Neue Verbindungen vorschlagen"
#: ../../mod/connections.php:247
msgid "Show pending (new) connections"
-msgstr "Zeige schwebende (neue) Verbindungen"
+msgstr "Zeige ausstehende (neue) Verbindungsanfragen"
#: ../../mod/connections.php:253
msgid "Show all connections"
@@ -6531,7 +6570,7 @@ msgstr "Ergebnisse:"
#: ../../mod/notifications.php:26
msgid "Invalid request identifier."
-msgstr "Ungültige Anfrage Identifikator."
+msgstr "Ungültiger Anfrage-Identifikator."
#: ../../mod/notifications.php:35
msgid "Discard"
@@ -6547,11 +6586,11 @@ msgstr "System-Benachrichtigungen"
#: ../../mod/blocks.php:65
msgid "Block Name"
-msgstr "Block Name"
+msgstr "Block-Name"
#: ../../mod/oexchange.php:23
msgid "Unable to find your hub."
-msgstr "Konnte den Hub nicht finden."
+msgstr "Konnte Deinen Server nicht finden."
#: ../../mod/oexchange.php:37
msgid "Post successful."
@@ -6575,7 +6614,7 @@ msgstr "Der Zugang zu diesem Profil ist begrenzt."
#: ../../mod/poke.php:159
msgid "Poke/Prod"
-msgstr "Anstupsen/Kuffen"
+msgstr "Anstupsen/Knuffen"
#: ../../mod/poke.php:160
msgid "poke, prod or do other things to somebody"
@@ -6587,7 +6626,7 @@ msgstr "Empfänger"
#: ../../mod/poke.php:162
msgid "Choose what you wish to do to recipient"
-msgstr "Wähle was du mit dem/r Empfänger/in tun willst"
+msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
#: ../../mod/poke.php:165
msgid "Make this post private"
@@ -6619,7 +6658,7 @@ msgstr "Freundschaftsempfehlung senden."
#: ../../mod/fsuggest.php:97
msgid "Suggest Friends"
-msgstr "Kontakte Vorschlagen"
+msgstr "Kontakte vorschlagen"
#: ../../mod/fsuggest.php:99
#, php-format
@@ -6644,7 +6683,7 @@ msgstr "Status:"
#: ../../mod/dirprofile.php:115
msgid "Sexual Preference: "
-msgstr "Sexuelle Vorlieben:"
+msgstr "Sexuelle Ausrichtung:"
#: ../../mod/dirprofile.php:117
msgid "Homepage: "
@@ -6660,7 +6699,7 @@ msgstr "Über:"
#: ../../mod/dirprofile.php:168
msgid "Keywords: "
-msgstr "Schlüsselbegriffe:"
+msgstr "Schlüsselwörter:"
#: ../../mod/filestorage.php:68
msgid "Permission Denied."
@@ -6668,14 +6707,14 @@ msgstr "Zugriff verweigert."
#: ../../mod/filestorage.php:85
msgid "File not found."
-msgstr "Datei nicht gefunden"
+msgstr "Datei nicht gefunden."
#: ../../mod/filestorage.php:119
msgid "Edit file permissions"
msgstr "Dateiberechtigungen bearbeiten"
-#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
-#: ../../mod/photos.php:946
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:607
+#: ../../mod/photos.php:950
msgid "Permissions"
msgstr "Berechtigungen"
@@ -6689,11 +6728,11 @@ msgstr "Zurück zur Dateiliste"
#: ../../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"
+msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
#: ../../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"
+msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
#: ../../mod/filestorage.php:167
msgid "Download"
@@ -6715,7 +6754,7 @@ msgstr "Limit:"
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
"hours."
-msgstr "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut."
+msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
#: ../../mod/message.php:41
msgid "Conversation removed."
@@ -6731,7 +6770,7 @@ msgstr "D, d. M Y - g:i A"
#: ../../mod/pubsites.php:22
msgid "Public Sites"
-msgstr "Öffentliche Seiten"
+msgstr "Öffentliche Server"
#: ../../mod/pubsites.php:25
msgid ""
@@ -6740,15 +6779,15 @@ msgid ""
"in the matrix as a whole. Some sites may require subscription or provide "
"tiered service plans. The provider links <strong>may</strong> provide "
"additional details."
-msgstr "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details diesbezüglich stehen."
+msgstr "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen."
#: ../../mod/pubsites.php:31
msgid "Site URL"
-msgstr "URL der Seite"
+msgstr "Server-URL"
#: ../../mod/pubsites.php:31
msgid "Access Type"
-msgstr "Zugangs Typ"
+msgstr "Zugangstyp"
#: ../../mod/pubsites.php:31
msgid "Registration Policy"
@@ -6756,12 +6795,12 @@ msgstr "Registrierungsrichtlinien"
#: ../../mod/register.php:43
msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Maximale Anzahl von Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
+msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
#: ../../mod/register.php:49
msgid ""
"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Bitte stimme den Nutzungsbedingungen zu. Anmeldung fehlgeschlagen."
+msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
#: ../../mod/register.php:77
msgid "Passwords do not match."
@@ -6771,7 +6810,7 @@ msgstr "Passwörter stimmen nicht überein."
msgid ""
"Registration successful. Please check your email for validation "
"instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
#: ../../mod/register.php:111
msgid "Your registration is pending approval by the site owner."
@@ -6783,17 +6822,17 @@ msgstr "Deine Registrierung konnte nicht verarbeitet werden."
#: ../../mod/register.php:147
msgid "Registration on this site/hub is by approval only."
-msgstr "Anmeldungen auf dieser Seite / diesem Hub benötigen Zustimmung durch den Administrator"
+msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
#: ../../mod/register.php:148
msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr "<a href=\"pubsites\">Registrierung auf einer angeschlossenen Seite</a>"
+msgstr "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>"
#: ../../mod/register.php:156
msgid ""
"This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
#: ../../mod/register.php:167
msgid "Terms of Service"
@@ -6815,7 +6854,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli
#: ../../mod/register.php:195
msgid "Please enter your invitation code"
-msgstr "Bitte trage deinen Einladungs-Code ein"
+msgstr "Bitte trage Deinen Einladungs-Code ein"
#: ../../mod/register.php:198
msgid "Your email address"
@@ -6827,7 +6866,7 @@ msgstr "Passwort"
#: ../../mod/register.php:200
msgid "Please re-enter your password"
-msgstr "Bitte gib dein Passwort noch einmal ein"
+msgstr "Bitte gib Dein Passwort noch einmal ein"
#: ../../mod/regmod.php:12
msgid "Please login."
@@ -6835,17 +6874,17 @@ msgstr "Bitte melde dich an."
#: ../../mod/removeme.php:49
msgid "Remove This Channel"
-msgstr "Diesen Kanal löschen!"
+msgstr "Diesen Kanal löschen"
#: ../../mod/removeme.php:50
msgid ""
"This will completely remove this channel from the network. Once this has "
"been done it is not recoverable."
-msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar."
+msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden."
#: ../../mod/removeme.php:51
msgid "Please enter your password for verification:"
-msgstr "Bitte gib zur Bestätigung dein Passwort ein:"
+msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
#: ../../mod/removeme.php:52
msgid "Remove this channel and all its clones from the network"
@@ -6855,137 +6894,137 @@ msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
msgid ""
"By default only the instance of the channel located on this hub will be "
"removed from the network"
-msgstr "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk"
+msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
#: ../../mod/removeme.php:53
msgid "Remove Channel"
-msgstr "Kanal entfernen"
+msgstr "Kanal löschen"
#: ../../mod/photos.php:77
msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Betreiber der Seite konnten nicht gefunden werden."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
#: ../../mod/photos.php:97
msgid "Album not found."
msgstr "Album nicht gefunden."
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
+#: ../../mod/photos.php:119 ../../mod/photos.php:672
msgid "Delete Album"
msgstr "Album löschen"
-#: ../../mod/photos.php:159 ../../mod/photos.php:951
+#: ../../mod/photos.php:159 ../../mod/photos.php:955
msgid "Delete Photo"
msgstr "Foto löschen"
-#: ../../mod/photos.php:452
+#: ../../mod/photos.php:453
msgid "No photos selected"
msgstr "Keine Fotos ausgewählt"
-#: ../../mod/photos.php:499
+#: ../../mod/photos.php:500
msgid "Access to this item is restricted."
-msgstr "Zugriff auf dieses Foto wurde eingeschränkt."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
-#: ../../mod/photos.php:573
+#: ../../mod/photos.php:577
#, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers."
+msgstr "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers."
-#: ../../mod/photos.php:576
+#: ../../mod/photos.php:580
#, php-format
msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr "Du verwendets %1$.2f MBytes deines Foto-Speichers."
+msgstr "Du verwendest %1$.2f MBytes Deines Foto-Speichers."
-#: ../../mod/photos.php:595
+#: ../../mod/photos.php:599
msgid "Upload Photos"
msgstr "Fotos hochladen"
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
+#: ../../mod/photos.php:603 ../../mod/photos.php:667
msgid "New album name: "
msgstr "Name des neuen Albums:"
-#: ../../mod/photos.php:600
+#: ../../mod/photos.php:604
msgid "or existing album name: "
-msgstr "oder bestehenden Album Namen:"
+msgstr "Oder bestehender Album-Name:"
-#: ../../mod/photos.php:601
+#: ../../mod/photos.php:605
msgid "Do not show a status post for this upload"
msgstr "Keine Statusnachricht für diesen Upload senden"
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
-#: ../../mod/photos.php:1138
+#: ../../mod/photos.php:656 ../../mod/photos.php:678 ../../mod/photos.php:1127
+#: ../../mod/photos.php:1142
msgid "Contact Photos"
-msgstr "Kontakt Bilder"
+msgstr "Kontakt-Bilder"
-#: ../../mod/photos.php:678
+#: ../../mod/photos.php:682
msgid "Edit Album"
msgstr "Album bearbeiten"
-#: ../../mod/photos.php:684
+#: ../../mod/photos.php:688
msgid "Show Newest First"
-msgstr "Zeige neueste zuerst"
+msgstr "Zeige Neueste zuerst"
-#: ../../mod/photos.php:686
+#: ../../mod/photos.php:690
msgid "Show Oldest First"
-msgstr "Zeige älteste zuerst"
+msgstr "Zeige Älteste zuerst"
-#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+#: ../../mod/photos.php:733 ../../mod/photos.php:1174
msgid "View Photo"
msgstr "Foto ansehen"
-#: ../../mod/photos.php:775
+#: ../../mod/photos.php:779
msgid "Permission denied. Access to this item may be restricted."
msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:781
msgid "Photo not available"
msgstr "Foto nicht verfügbar"
-#: ../../mod/photos.php:837
+#: ../../mod/photos.php:841
msgid "Use as profile photo"
msgstr "Als Profilfoto verwenden"
-#: ../../mod/photos.php:861
+#: ../../mod/photos.php:865
msgid "View Full Size"
msgstr "In voller Größe anzeigen"
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:939
msgid "Edit photo"
msgstr "Foto bearbeiten"
-#: ../../mod/photos.php:937
+#: ../../mod/photos.php:941
msgid "Rotate CW (right)"
-msgstr "Drehen US (rechts)"
+msgstr "Drehen im UZS (rechts)"
-#: ../../mod/photos.php:938
+#: ../../mod/photos.php:942
msgid "Rotate CCW (left)"
-msgstr "Drehen EUS (links)"
+msgstr "Drehen gegen UZS (links)"
-#: ../../mod/photos.php:940
+#: ../../mod/photos.php:944
msgid "New album name"
msgstr "Name des neuen Albums:"
-#: ../../mod/photos.php:943
+#: ../../mod/photos.php:947
msgid "Caption"
msgstr "Bildunterschrift"
-#: ../../mod/photos.php:945
+#: ../../mod/photos.php:949
msgid "Add a Tag"
msgstr "Schlagwort hinzufügen"
-#: ../../mod/photos.php:948
+#: ../../mod/photos.php:952
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1105
msgid "In This Photo:"
msgstr "Auf diesem Foto:"
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1180
msgid "View Album"
msgstr "Album ansehen"
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1189
msgid "Recent Photos"
msgstr "Neueste Fotos"
@@ -6995,7 +7034,7 @@ msgstr "Laune"
#: ../../mod/mood.php:139
msgid "Set your current mood and tell your friends"
-msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
+msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
#: ../../mod/ping.php:192
msgid "sent you a private message"
@@ -7015,7 +7054,7 @@ msgstr "Standard-Schema"
#: ../../view/theme/redbasic/php/config.php:87
msgid "silver"
-msgstr "Silber"
+msgstr "silbern"
#: ../../view/theme/redbasic/php/config.php:98
#: ../../view/theme/apw/php/config.php:234
@@ -7035,7 +7074,7 @@ msgstr "Farbe der Navigationsleiste"
#: ../../view/theme/redbasic/php/config.php:101
msgid "link colour"
-msgstr "Farbe der Verweise"
+msgstr "Farbe der Links"
#: ../../view/theme/redbasic/php/config.php:102
msgid "Set font-colour for banner"
@@ -7072,7 +7111,7 @@ msgstr "Schriftgröße für die ganze Applikation"
#: ../../view/theme/redbasic/php/config.php:110
#: ../../view/theme/apw/php/config.php:236
msgid "Set font-size for posts and comments"
-msgstr "Wähle die Schriftgröße für Beiträge und Kommentare"
+msgstr "Schriftgröße für Beiträge und Kommentare"
#: ../../view/theme/redbasic/php/config.php:111
msgid "Set font-colour for posts and comments"
@@ -7088,7 +7127,7 @@ msgstr "Schattentiefe von Fotos"
#: ../../view/theme/redbasic/php/config.php:114
msgid "Set maximum width of conversation regions"
-msgstr "Maximalbreite der Konversationsbereiche"
+msgstr "Maximalbreite der Unterhaltungsbereiche"
#: ../../view/theme/redbasic/php/config.php:115
msgid "Set minimum opacity of nav bar - to hide it"
@@ -7108,7 +7147,7 @@ msgstr "Schräge Fotoalben"
#: ../../view/theme/redbasic/php/config.php:118
msgid "Are you a clean desk or a messy desk person?"
-msgstr "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
+msgstr "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
#: ../../view/theme/apw/php/config.php:193
#: ../../view/theme/apw/php/config.php:211
@@ -7129,7 +7168,7 @@ msgstr "Schriftart"
#: ../../view/theme/apw/php/config.php:238
msgid "Set iconset"
-msgstr "Iconset"
+msgstr "Icon-Set"
#: ../../view/theme/apw/php/config.php:239
msgid "Set big shadow size, default 15px 15px 15px"
@@ -7149,7 +7188,7 @@ msgstr "Ecken-Radius (Default 5px)"
#: ../../view/theme/apw/php/config.php:243
msgid "Set line-height for posts and comments"
-msgstr "Wähle die Zeilenhöhe in Beiträgen und Kommentaren"
+msgstr "Zeilenhöhe für Beiträge und Kommentare"
#: ../../view/theme/apw/php/config.php:244
msgid "Set background image"
@@ -7197,7 +7236,7 @@ msgstr "Größe des Hintergrund-Elements"
#: ../../view/theme/apw/php/config.php:255
msgid "Item opacity"
-msgstr "Opazität von Beiträgen"
+msgstr "Deckkraft von Beiträgen (z.B. 0.8)"
#: ../../view/theme/apw/php/config.php:256
msgid "Display post previews only"
@@ -7263,7 +7302,7 @@ msgstr "Aktualisierungsfehler auf %s"
#: ../../boot.php:1399
msgid ""
"Create an account to access services and applications within the Red Matrix"
-msgstr "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können."
+msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."
#: ../../boot.php:1427
msgid "Password"
@@ -7287,4 +7326,4 @@ msgstr "Haste schon Zot?"
#: ../../boot.php:1899
msgid "toggle mobile"
-msgstr "auf/von Mobile Ansicht wechseln"
+msgstr "auf/von mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 00da85a02..ac1abc8f7 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -4,6 +4,45 @@ function string_plural_select_de($n){
return ($n != 1);;
}
;
+$a->strings["Categories"] = "Kategorien";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
+$a->strings["Suggestions"] = "Vorschläge";
+$a->strings["See more..."] = "Mehr anzeigen …";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen.";
+$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["Saved Searches"] = "Gesicherte Suchanfragen";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Saved Folders"] = "Gesicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Archives"] = "Archive";
+$a->strings["Refresh"] = "Aktualisieren";
+$a->strings["Me"] = "Ich";
+$a->strings["Best Friends"] = "Beste Freunde";
+$a->strings["Friends"] = "Freunde";
+$a->strings["Co-workers"] = "Kollegen";
+$a->strings["Former Friends"] = "ehem. Freunde";
+$a->strings["Acquaintances"] = "Bekannte";
+$a->strings["Everybody"] = "Jeder";
+$a->strings["Account settings"] = "Konto-Einstellungen";
+$a->strings["Channel settings"] = "Kanal-Einstellungen";
+$a->strings["Additional features"] = "Zusätzliche Funktionen";
+$a->strings["Feature settings"] = "Funktions-Einstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Apps";
+$a->strings["Export channel"] = "Kanal exportieren";
+$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
+$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+$a->strings["Channel Sources"] = "Kanal-Quellen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Check Mail"] = "E-Mails abrufen";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Chat Rooms"] = "Chaträume";
$a->strings["Visible to everybody"] = "Für jeden sichtbar";
$a->strings["show"] = "zeigen";
$a->strings["don't show"] = "Verbergen";
@@ -25,9 +64,9 @@ $a->strings["Your photos"] = "Deine Bilder";
$a->strings["Files"] = "Dateien";
$a->strings["Your files"] = "Deine Dateien";
$a->strings["Chat"] = "Chat";
-$a->strings["Your chatrooms"] = "Deine Chat-Räume";
+$a->strings["Your chatrooms"] = "Deine Chaträume";
$a->strings["Events"] = "Veranstaltungen";
-$a->strings["Your events"] = "Deine Veransctaltungen";
+$a->strings["Your events"] = "Deine Veranstaltungen";
$a->strings["Bookmarks"] = "Lesezeichen";
$a->strings["Your bookmarks"] = "Deine Lesezeichen";
$a->strings["Webpages"] = "Webseiten";
@@ -35,7 +74,7 @@ $a->strings["Your webpages"] = "Deine Webseiten";
$a->strings["Login"] = "Anmelden";
$a->strings["Sign in"] = "Anmelden";
$a->strings["%s - click to logout"] = "%s - Klick zum Abmelden";
-$a->strings["Click to authenticate to your home hub"] = "Klick zum Authentifizieren bei Deinem Heimat-Hub";
+$a->strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
$a->strings["Home Page"] = "Homepage";
$a->strings["Register"] = "Registrieren";
$a->strings["Create an account"] = "Erzeuge ein Konto";
@@ -65,16 +104,14 @@ $a->strings["See all private messages"] = "Alle persönlichen Nachrichten ansehe
$a->strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
$a->strings["Inbox"] = "Eingang";
$a->strings["Outbox"] = "Ausgang";
-$a->strings["New Message"] = "Neue Nachricht";
$a->strings["Event Calendar"] = "Veranstaltungskalender";
$a->strings["See all events"] = "Alle Ereignisse ansehen";
$a->strings["Mark all events seen"] = "Markiere alle Ereignisse als gesehen";
$a->strings["Channel Select"] = "Kanal-Auswahl";
$a->strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
-$a->strings["Settings"] = "Einstellungen";
$a->strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
$a->strings["Connections"] = "Verbindungen";
-$a->strings["Manage/Edit Friends and Connections"] = "Verwalte/Bearbeite Freunde und Verbindungen";
+$a->strings["Manage/Edit Friends and Connections"] = "Freunde und Verbindungen verwalten";
$a->strings["Admin"] = "Admin";
$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
$a->strings["Nothing new here"] = "Nichts Neues hier";
@@ -90,8 +127,7 @@ $a->strings["%d Connection"] = array(
0 => "%d Verbindung",
1 => "%d Verbindungen",
);
-$a->strings["View Connections"] = "Zeige Verbindungen";
-$a->strings["Save"] = "Speichern";
+$a->strings["View Connections"] = "Verbindungen anzeigen";
$a->strings["poke"] = "anstupsen";
$a->strings["poked"] = "stupste";
$a->strings["ping"] = "anpingen";
@@ -149,9 +185,9 @@ $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["Select a page layout: "] = "Ein Seiten-Layout auswählen:";
$a->strings["default"] = "Standard";
-$a->strings["Page content type: "] = "Content-Typ der Seite";
+$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";
@@ -163,42 +199,12 @@ $a->strings["Blocks"] = "Blöcke";
$a->strings["Menus"] = "Menüs";
$a->strings["Layouts"] = "Layouts";
$a->strings["Pages"] = "Seiten";
-$a->strings["Categories"] = "Kategorien";
-$a->strings["Connect"] = "Verbinden";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verstecken";
-$a->strings["Suggestions"] = "Vorschläge";
-$a->strings["See more..."] = "Mehr anzeigen...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Du bist %1$.0f von %2$.0f erlaubten Verbindungen eingegangen.";
-$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["Remove term"] = "Eintrag löschen";
-$a->strings["Saved Searches"] = "Gesicherte Suchanfragen";
-$a->strings["add"] = "hinzufügen";
-$a->strings["Saved Folders"] = "Gesicherte Ordner";
-$a->strings["Everything"] = "Alles";
-$a->strings["Archives"] = "Archive";
-$a->strings["Refresh"] = "Aktualisieren";
-$a->strings["Me"] = "Ich";
-$a->strings["Best Friends"] = "Beste Freunde";
-$a->strings["Friends"] = "Freunde";
-$a->strings["Co-workers"] = "Kollegen";
-$a->strings["Former Friends"] = "ehem. Freunde";
-$a->strings["Acquaintances"] = "Bekanntschaften";
-$a->strings["Everybody"] = "Jeder";
-$a->strings["Account settings"] = "Konto-Einstellungen";
-$a->strings["Channel settings"] = "Kanal-Einstellungen";
-$a->strings["Additional features"] = "Zusätzliche Funktionen";
-$a->strings["Feature settings"] = "Funktions-Einstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Apps";
-$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["Channel Sources"] = "Kanal Quellen";
-$a->strings["Check Mail"] = "E-Mails abrufen";
-$a->strings["Chat Rooms"] = "Chaträume";
+$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["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";
$a->strings["General Features"] = "Allgemeine Funktionen";
@@ -208,20 +214,20 @@ $a->strings["Multiple Profiles"] = "Mehrfachprofile";
$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
$a->strings["Web Pages"] = "Webseiten";
$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
-$a->strings["Private Notes"] = "private Notizen";
+$a->strings["Private Notes"] = "Private Notizen";
$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt.";
+$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt.";
$a->strings["Expert Mode"] = "Expertenmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
$a->strings["Premium Channel"] = "Premium-Kanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht Einschränkungen und Bedingungen für Kontakte dieses Kanals";
$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
$a->strings["Richtext Editor"] = "Formatierungseditor";
$a->strings["Enable richtext editor"] = "Aktiviere Formatierungseditor";
$a->strings["Post Preview"] = "Voransicht";
$a->strings["Allow previewing posts and comments before publishing them"] = "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
@@ -236,7 +242,7 @@ $a->strings["Network New Tab"] = "Netzwerkreiter Neu";
$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
$a->strings["Affinity Tool"] = "Beziehungs-Tool";
$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
-$a->strings["Suggest Channels"] = "Kanäle Vorschlagen";
+$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
$a->strings["Show channel suggestions"] = "Kanal-Vorschläge anzeigen";
$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
$a->strings["Edit Sent Posts"] = "Bearbeite gesendete Beiträge";
@@ -247,11 +253,11 @@ $a->strings["Post Categories"] = "Beitrags-Kategorien";
$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
-$a->strings["Ability to dislike posts/comments"] = "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare";
+$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
-$a->strings["Tag Cloud"] = "Tag Wolke";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen";
+$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
$a->strings["Block immediately"] = "Sofort blockieren";
$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller";
@@ -292,7 +298,7 @@ $a->strings["minutes"] = "Minuten";
$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["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
$a->strings["Starts:"] = "Beginnt:";
$a->strings["Finishes:"] = "Endet:";
@@ -312,8 +318,8 @@ $a->strings["show fewer"] = "Zeige weniger";
$a->strings["Password too short"] = "Kennwort zu kurz";
$a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
$a->strings["everybody"] = "alle";
-$a->strings["Secret Passphrase"] = "geheime Passwort-Phrase";
-$a->strings["Passphrase hint"] = "Hinweis zur Phrase";
+$a->strings["Secret Passphrase"] = "geheime Passphrase";
+$a->strings["Passphrase hint"] = "Hinweis zur Passphrase";
$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo";
$a->strings["ago"] = "her";
@@ -342,32 +348,26 @@ $a->strings["No source file."] = "Keine Quelldatei.";
$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe deiner Datei-Anhänge haben das Maximum von %1$.0f MByte erreicht.";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
$a->strings["Path not available."] = "Pfad nicht verfügbar.";
-$a->strings["Empty pathname"] = "leere Pfadangabe";
+$a->strings["Empty pathname"] = "Leere Pfadangabe";
$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
$a->strings["Path not found."] = "Pfad nicht gefunden.";
$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-$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["%1\$s's bookmarks"] = "%1\$s's Lesezeichen";
+$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
$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";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht";
$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
$a->strings["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s";
$a->strings["Select"] = "Auswählen";
$a->strings["Delete"] = "Löschen";
$a->strings["Message is verified"] = "Nachricht überprüft";
-$a->strings["View %s's profile @ %s"] = "Schaue Dir %s's Profil auf %s an.";
+$a->strings["View %s's profile @ %s"] = "%ss Profil auf %s ansehen";
$a->strings["Categories:"] = "Kategorien:";
$a->strings["Filed under:"] = "Gespeichert unter:";
$a->strings[" from %s"] = "von %s";
@@ -382,7 +382,7 @@ $a->strings["View Source"] = "Quelle anzeigen";
$a->strings["Follow Thread"] = "Unterhaltung folgen";
$a->strings["View Status"] = "Status ansehen";
$a->strings["View Photos"] = "Fotos ansehen";
-$a->strings["Matrix Activity"] = "Matrix Aktivität";
+$a->strings["Matrix Activity"] = "Matrix-Aktivität";
$a->strings["Edit Contact"] = "Kontakt bearbeiten";
$a->strings["Send PM"] = "Sende PN";
$a->strings["Poke"] = "Anstupsen";
@@ -409,7 +409,7 @@ $a->strings["Please enter a video link/URL:"] = "Gib einen Video-Link/URL ein:";
$a->strings["Please enter an audio link/URL:"] = "Gib einen Audio-Link/URL ein:";
$a->strings["Tag term:"] = "Schlagwort:";
$a->strings["Save to Folder:"] = "Speichern in Ordner:";
-$a->strings["Where are you right now?"] = "Wo bist du jetzt grade?";
+$a->strings["Where are you right now?"] = "Wo bist Du jetzt grade?";
$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
$a->strings["Preview"] = "Vorschau";
$a->strings["Share"] = "Teilen";
@@ -436,27 +436,27 @@ $a->strings["Public post"] = "Öffentlicher Beitrag";
$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
$a->strings["Set expiration date"] = "Verfallsdatum";
$a->strings["Encrypt text"] = "Text verschlüsseln";
-$a->strings["OK"] = "OK";
+$a->strings["OK"] = "Ok";
$a->strings["Cancel"] = "Abbrechen";
$a->strings["Commented Order"] = "Neueste Kommentare";
$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortiert";
$a->strings["Posted Order"] = "Neueste Beiträge";
$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortiert";
$a->strings["Personal"] = "Persönlich";
-$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung deinerseits";
+$a->strings["Posts that mention or involve you"] = "Beiträge mit Beteiligung Deinerseits";
$a->strings["New"] = "Neu";
-$a->strings["Activity Stream - by date"] = "Activity Stream - nach Datum sortiert";
+$a->strings["Activity Stream - by date"] = "Activity Stream – nach Datum sortiert";
$a->strings["Starred"] = "Markiert";
-$a->strings["Favourite Posts"] = "Beiträge mit Sternchen";
+$a->strings["Favourite Posts"] = "Markierte Beiträge";
$a->strings["Spam"] = "Spam";
-$a->strings["Posts flagged as SPAM"] = "Nachrichten die als SPAM markiert wurden";
+$a->strings["Posts flagged as SPAM"] = "Nachrichten, die als SPAM markiert wurden";
$a->strings["Channel"] = "Kanal";
$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
$a->strings["About"] = "Über";
$a->strings["Profile Details"] = "Profil-Details";
$a->strings["Photo Albums"] = "Fotoalben";
$a->strings["Files and Storage"] = "Dateien und Speicher";
-$a->strings["Chatrooms"] = "Chat-Räume";
+$a->strings["Chatrooms"] = "Chaträume";
$a->strings["Events and Calendar"] = "Veranstaltungen und Kalender";
$a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
$a->strings["Manage Webpages"] = "Webseiten verwalten";
@@ -469,9 +469,9 @@ $a->strings["Nickname has unsupported characters or is already being used on thi
$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
$a->strings["Default Profile"] = "Standard-Profil";
$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Profil ansehen zu dürfen.";
+$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Entschuldigung, Du besitzt nicht die nötigen Rechte, um dieses Profil zu betrachten.";
$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
-$a->strings["Change profile photo"] = "Ändere das Profilfoto";
+$a->strings["Change profile photo"] = "Profilfoto ändern";
$a->strings["Profiles"] = "Profile";
$a->strings["Manage/edit profiles"] = "Verwalte/Bearbeite Profile";
$a->strings["Create New Profile"] = "Neues Profil erstellen";
@@ -497,7 +497,7 @@ $a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F";
$a->strings["Birthday:"] = "Geburtstag:";
$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
+$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
$a->strings["Hometown:"] = "Heimatstadt:";
$a->strings["Tags:"] = "Schlagworte:";
@@ -505,8 +505,8 @@ $a->strings["Political Views:"] = "Politische Ansichten:";
$a->strings["Religion:"] = "Religion:";
$a->strings["About:"] = "Über:";
$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-$a->strings["Likes:"] = "Gefällt-mir:";
-$a->strings["Dislikes:"] = "Gefällt-mir-nicht:";
+$a->strings["Likes:"] = "Gefällt:";
+$a->strings["Dislikes:"] = "Gefällt nicht:";
$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
$a->strings["My other channels:"] = "Meine anderen Kanäle:";
$a->strings["Musical interests:"] = "Musikalische Interessen:";
@@ -521,26 +521,26 @@ $a->strings["Edit"] = "Bearbeiten";
$a->strings["save to folder"] = "In Ordner speichern";
$a->strings["add star"] = "markieren";
$a->strings["remove star"] = "Markierung entfernen";
-$a->strings["toggle star status"] = "Stern-Status umschalten";
+$a->strings["toggle star status"] = "Markierung umschalten";
$a->strings["starred"] = "markiert";
$a->strings["add tag"] = "Schlagwort hinzufügen";
-$a->strings["I like this (toggle)"] = "Ich mag das (Umschalter)";
-$a->strings["like"] = "Gefällt-mir";
-$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (Umschalter)";
-$a->strings["dislike"] = "Gefällt-mir-nicht";
+$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
+$a->strings["like"] = "mag";
+$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
+$a->strings["dislike"] = "verurteile";
$a->strings["Share this"] = "Teile dies";
$a->strings["share"] = "Teilen";
-$a->strings["View %s's profile - %s"] = "Schaue dir %s's Profil an - %s";
-$a->strings["to"] = "zu";
+$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
+$a->strings["to"] = "an";
$a->strings["via"] = "via";
$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["Bookmark Links"] = "Setze Lesezeichen für die Verweise";
+$a->strings["Bookmark Links"] = "Setze Lesezeichen für die Links";
$a->strings["%d comment"] = array(
0 => "%d Kommentar",
1 => "%d Kommentare",
);
-$a->strings["This is you"] = "Das bist du";
+$a->strings["This is you"] = "Das bist Du";
$a->strings["Submit"] = "Bestätigen";
$a->strings["Bold"] = "Fett";
$a->strings["Italic"] = "Kursiv";
@@ -616,19 +616,19 @@ $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["Room is full"] = "Der Raum ist voll";
-$a->strings["Tags"] = "Tags";
-$a->strings["Keywords"] = "Schlüsselbegriffe";
+$a->strings["Tags"] = "Schlagwörter";
+$a->strings["Keywords"] = "Schlüsselwörter";
$a->strings["have"] = "habe";
$a->strings["has"] = "hat";
$a->strings["want"] = "will";
$a->strings["wants"] = "will";
-$a->strings["likes"] = "Gefällt-mir";
-$a->strings["dislikes"] = "Gefällt-mir-nicht";
+$a->strings["likes"] = "gefällt";
+$a->strings["dislikes"] = "missfällt";
$a->strings["Logged out."] = "Ausgeloggt.";
$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
$a->strings["Login failed."] = "Login fehlgeschlagen.";
$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist nicht unter denen, die auf dieser Seite erlaubt sind";
+$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
@@ -636,7 +636,7 @@ $a->strings["Please enter the required information."] = "Bitte gib die benötigt
$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
$a->strings["Administrator"] = "Administrator";
-$a->strings["your registration password"] = "dein Registrierungspasswort";
+$a->strings["your registration password"] = "Dein Registrierungspasswort";
$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
$a->strings["Account approved."] = "Account bestätigt.";
$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
@@ -653,36 +653,36 @@ $a->strings["Thank You,"] = "Danke.";
$a->strings["%s Administrator"] = "%s Administrator";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
$a->strings["[Red:Notify] New mail received at %s"] = "[Red Notify] Neue Mail auf %s empfangen";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat dir eine private Nachricht auf %3\$s gesendet.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat dir %2\$s geschickt.";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt.";
$a->strings["a private message"] = "eine private Nachricht";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]a %4\$s[/zrl] kommentiert";
$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen %4\$s[/zrl] kommentiert";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat ein Thema kommentiert, dem du folgst.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren.";
$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Hinweis] %s schrieb auf Deine Pinnwand";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf deine Pinnwand auf %3\$s geschrieben";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]deine Pinnwand[/zrl] geschrieben";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat dich getaggt";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat dich erwähnt[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat dich angestupst";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat dich auf %3\$s angestubst";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat dich angestupst[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Dich getaggt";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat deinen Beitrag auf %3\$s getaggt";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]deinen Beitrag[/zrl] getaggt";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s hat auf Deine Pinnwand auf %3\$s geschrieben";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s hat auf [zrl=%3\$s]Deine Pinnwand[/zrl] geschrieben";
+$a->strings["[Red:Notify] %s tagged you"] = "[Red Notify] %s hat Dich erwähnt";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s erwähnt";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]hat Dich erwähnt[/zrl].";
+$a->strings["[Red:Notify] %1\$s poked you"] = "[Red Notify] %1\$s hat Dich angestupst";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s hat Dich auf %3\$s angestupst";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]hat Dich angestupst[/zrl].";
+$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Hinweis] %s hat Deinen Beitrag verschlagwortet";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s hat Deinen Beitrag auf %3\$s verschlagwortet";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen Beitrag[/zrl] verschlagwortet";
$a->strings["[Red:Notify] Introduction received"] = "[Red:Notify] Vorstellung erhalten";
-$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
+$a->strings["%1\$s, you've received an introduction from '%2\$s' at %3\$s"] = "%1\$s, Du hast eine Vorstellung von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]an introduction[/zrl] from %3\$s."] = "%1\$s, Du hast [zrl=%2\$s]eine Vorstellung[/zrl] von %3\$s erhalten.";
$a->strings["You may visit their profile at %s"] = "Du kannst Dir das Profil unter %s ansehen";
$a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s um sie anzunehmen oder abzulehnen.";
$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, du hast einen Freundschaftsvorschlag von „%2\$s“ auf %3\$s erhalten";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, du hast [zrl=%2\$s]einen Freundschaftvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, Du hast einen Kontaktvorschlag von „%2\$s“ auf %3\$s erhalten";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, Du hast [zrl=%2\$s]einen Kontaktvorschlag[/zrl] für %3\$s von %4\$s erhalten.";
$a->strings["Name:"] = "Name:";
$a->strings["Photo:"] = "Foto:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
@@ -718,7 +718,7 @@ $a->strings["Channel discovery failed. Website may be down or misconfigured."] =
$a->strings["Response from remote channel was not understood."] = "Antwort des entfernten Kanals war unverständlich.";
$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
-$a->strings["Cannot connect to yourself."] = "Du kannst dich nicht mit dir selbst verbinden.";
+$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
$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["Default"] = "Standard";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
@@ -739,11 +739,11 @@ $a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschr
$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
$a->strings["Can write to my \"public\" file storage"] = "Kann in meinen öffentlichen Dateiordner schreiben";
$a->strings["Can edit my \"public\" pages"] = "Kann meine öffentlichen Seiten bearbeiten";
-$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine \"öffentlichen\" Beiträge als Quellen von Kanälen verwenden";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas Fortgeschritten - sehr nützlich in offenen Gemeinschaften.";
+$a->strings["Can source my \"public\" posts in derived channels"] = "Kann meine „öffentlichen“ Beiträge als Quellen für andere Kanäle verwenden";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
$a->strings["Can send me bookmarks"] = "Darf mir Lesezeichen senden";
$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite dies nur, wenn du genau weißt, was du machst";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
$a->strings["Permission denied"] = "Keine Berechtigung";
$a->strings["Item not found."] = "Element nicht gefunden.";
$a->strings["Collection not found."] = "Sammlung nicht gefunden";
@@ -782,15 +782,17 @@ $a->strings["Show Thing"] = "Ding anzeigen";
$a->strings["item not found."] = "Eintrag nicht gefunden";
$a->strings["Edit Thing"] = "Ding bearbeiten";
$a->strings["Select a profile"] = "Wähle ein Profil";
-$a->strings["Select a category of stuff. e.g. I ______ something"] = "Wähle eine Kategorie für das Zeugs, z.B. Ich ______ etwas";
+$a->strings["Select a category of stuff. e.g. I ______ something"] = "Wähle eine Kategorie/Art, z.B. Ich ______ etwas";
+$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
+$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
$a->strings["Name of thing e.g. something"] = "Name des Dings, z.B. Etwas";
$a->strings["URL of thing (optional)"] = "URL des Dings (optional)";
$a->strings["URL for photo of thing (optional)"] = "URL eines Fotos von dem Ding (optional)";
-$a->strings["Add Thing to your Profile"] = "Das Ding deinem Profil hinzufügen";
-$a->strings["Total invitation limit exceeded."] = "Limit der maximalen Einladungen überschritten.";
+$a->strings["Add Thing to your Profile"] = "Das Ding Deinem Profil hinzufügen";
+$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
$a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator deiner Seite.";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines Red-Servers.";
$a->strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
$a->strings["%d message sent."] = array(
0 => "%d Nachricht gesendet.",
@@ -800,14 +802,14 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
$a->strings["Send invitations"] = "Einladungen senden";
$a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
$a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralisierten Kommunikations- und Informationsnetzwerk.";
+$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "Du bist herzlich eingeladen, mir und einigen anderen guten Freunden in die Red-Matrix zu folgen – einem revolutionär neuen, dezentralen Kommunikations- und Informationsnetzwerk.";
$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du musst dann den folgenden Einladungs-Code angeben: \$invite_code";
$a->strings["Please visit my channel at"] = "Bitte besuche meinen Kanal auf";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn du dich registriert hast (egal auf welcher Seite in der Red Matrix, sie sind alle miteinander verbunden) verbinde dich bitte mit meinem Kanal in der Matrix. Adresse:";
+$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wenn Du Dich registriert hast (egal auf welchem Server in der Red-Matrix, sie sind alle miteinander verbunden) verbinde Dich bitte mit meinem Kanal in der Matrix. Adresse:";
$a->strings["Click the [Register] link on the following page to join."] = "Klicke den [Registrieren]-Link auf der nächsten Seite, um dich anzumelden.";
-$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "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";
-$a->strings["Unable to locate original post."] = "Originalbeitrag kann nicht gefunden werden.";
-$a->strings["Empty post discarded."] = "Leerer Beitrag verworfen.";
+$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "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, besuche http://getzot.com";
+$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
$a->strings["Wall Photos"] = "Wall Fotos";
@@ -825,7 +827,7 @@ $a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
$a->strings["New Menu"] = "Neues Menü";
$a->strings["Menu name"] = "Menü Name";
-$a->strings["Must be unique, only seen by you"] = "Muss unverwechselbar sein, nur für dich sichtbar";
+$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
$a->strings["Menu title"] = "Menü Titel";
$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
@@ -839,148 +841,51 @@ $a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü h
$a->strings["Modify"] = "Ändern";
$a->strings["Not found."] = "Nicht gefunden.";
$a->strings["View"] = "Ansicht";
-$a->strings["Authorize application connection"] = "Zugriff der Anwendung authorizieren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode bei der Anwendung ein:";
+$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
$a->strings["Yes"] = "Ja";
$a->strings["No"] = "Nein";
-$a->strings["No installed applications."] = "Keine installierten Applikationen";
+$a->strings["No installed applications."] = "Keine installierten Anwendungen.";
$a->strings["Applications"] = "Anwendungen";
$a->strings["Edit post"] = "Bearbeite Beitrag";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++";
+$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red-Matrix-Gäste: Nutzername: {Deine E-Mail-Adresse}; Passwort: +++";
$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
$a->strings["My Bookmarks"] = "Meine Lesezeichen";
$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
-$a->strings["Name is required"] = "Name wird benötigt";
-$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
-$a->strings["Update"] = "Update";
-$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
-$a->strings["Password changed."] = "Kennwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
-$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
-$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
-$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Anwendung hinzufügen";
-$a->strings["Name"] = "Name";
-$a->strings["Name of application"] = "Name der Anwendung";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleitung";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit";
-$a->strings["Icon url"] = "Symbol-URL";
-$a->strings["Optional"] = "Optional";
-$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
-$a->strings["Connected Apps"] = "Verbundene Apps";
-$a->strings["Client key starts with"] = "Client key beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Authorisierung aufheben";
-$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-$a->strings["Feature Settings"] = "Funktions-Einstellungen";
-$a->strings["Account Settings"] = "Konto-Einstellungen";
-$a->strings["Password Settings"] = "Kennwort-Einstellungen";
-$a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern";
-$a->strings["Email Address:"] = "Email Adresse:";
-$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden.";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
-$a->strings["Additional Features"] = "Zusätzliche Funktionen";
-$a->strings["Connector Settings"] = "Connector-Einstellungen";
-$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Anzeige Theme:";
-$a->strings["Mobile Theme:"] = "Mobile Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum von 10 Sekunden, kein Maximum";
-$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:";
-$a->strings["Maximum of 100 items"] = "Maximum von 100 Beiträgen";
-$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
-$a->strings["Nobody except yourself"] = "Niemand außer du selbst";
-$a->strings["Only those you specifically allow"] = "Nur die, denen du es explizit erlaubst";
-$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
-$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
-$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
-$a->strings["Anybody on the internet"] = "Jeder im Internet";
-$a->strings["Publish your default profile in the network directory"] = "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["or"] = "oder";
-$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
-$a->strings["Channel Settings"] = "Kanal-Einstellungen";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
-$a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
-$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
-$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
-$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige deines Online-Status in deinem Profil";
-$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphären-Einstellungen";
-$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "";
-$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "";
-$a->strings["Private - <em>default private, never open or public</em>"] = "";
-$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "";
-$a->strings["Advanced Privacy Settings"] = "";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
-$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
-$a->strings["Default Post Permissions"] = "Beitragszugriffrechte Standardeinstellungen";
-$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
-$a->strings["Useful to reduce spamming"] = "Nützlich um Spam zu verringern";
-$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
-$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten wenn:";
-$a->strings["accepting a friend request"] = "einer Kontaktanfrage stattgegeben wurde";
-$a->strings["joining a forum/community"] = "ein Forum beigetreten wurde";
-$a->strings["making an <em>interesting</em> profile change"] = "eine <em>interessante</em> Änderung am Profil vorgenommen wurde";
-$a->strings["Send a notification email when:"] = "Eine Email Benachrichtigung senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
-$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
-$a->strings["Someone writes on your profile wall"] = "Jemand auf deine Pinnwand schreibt";
-$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
-$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag getaggt";
-$a->strings["You are poked/prodded/etc. in a post"] = "Du in einer Nachricht angestupst/geknufft/o.ä. wirst";
-$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account / Seiten Arten Einstellungen";
-$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$s's %3\$s";
-$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalte - bitte lade die Seite zur Anzeige neu]";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
+$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
$a->strings["Channel not found."] = "Kanal nicht gefunden.";
$a->strings["toggle full screen mode"] = "auf Vollbildmodus umschalten";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$s's %3\$s mit %4\$s getaggt";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
$a->strings["Leave Room"] = "Raum verlassen";
$a->strings["I am away right now"] = "Ich bin gerade nicht da";
$a->strings["I am online"] = "Ich bin online";
-$a->strings["New Chatroom"] = "Neuen Chatraum";
-$a->strings["Chatroom Name"] = "Chatraum Name";
-$a->strings["%1\$s's Chatrooms"] = "%1\$s's Chat-Räume";
+$a->strings["New Chatroom"] = "Neuer Chatraum";
+$a->strings["Chatroom Name"] = "Name des Chatraums";
+$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
$a->strings["No connections."] = "Keine Verbindungen.";
-$a->strings["Visit %s's profile [%s]"] = "Besuche %s's Profil [%s]";
+$a->strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
$a->strings["View Connnections"] = "Zeige Verbindungen";
$a->strings["Tag removed"] = "Schlagwort entfernt";
-$a->strings["Remove Item Tag"] = "Schlagwort des Beitrags entfernen";
-$a->strings["Select a tag to remove: "] = "Schlagwort zum entfernen auswählen:";
+$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
+$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
$a->strings["Remove"] = "Entferne";
$a->strings["Continue"] = "Fortfahren";
-$a->strings["Premium Channel Setup"] = "Prämium-Kanal Einrichtung";
-$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für den Prämium-Kanal aktivieren";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib deine Nutzungseinschränkungen ein, z.B. Paypal Quittung, Nutzungsbestimmungen etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen, vor dem Verbinden mit diesem Kanal nötig.";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Verbindungen werden den folgenden Text sehen bevor fortgefahren wird:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Mit dem fortfahren bestätige ich die Erfüllung aller Anweisungen die vom Seitenbetreiber erteilt wurden.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Seitenbetreiber hat keine speziellen Anweisungen für Kanal-Betreiber hinterlegt.)";
-$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Prämium-Kanal";
+$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
+$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen aus dieser Seite.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
+$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
-$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
+$a->strings["Delegate Page Management"] = "Delegiere das Management für diese Seite";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager";
$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
@@ -1003,7 +908,8 @@ $a->strings["Add menu element"] = "Menüelement hinzufügen";
$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
$a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
-$a->strings["Menu Item Permissions"] = "Menü-Element Zugriffsrechte";
+$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+$a->strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
$a->strings["Link text"] = "Link Text";
$a->strings["URL of link"] = "URL des Links";
$a->strings["Use Red magic-auth if available"] = "Verwende Red Magic-Auth wenn verfügbar";
@@ -1014,6 +920,11 @@ $a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+$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."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
+$a->strings["Visible To"] = "Sichtbar für";
+$a->strings["All Connections"] = "Alle Verbindungen";
$a->strings["Collection created."] = "Sammlung erstellt.";
$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
$a->strings["Collection updated."] = "Sammlung aktualisiert.";
@@ -1026,11 +937,6 @@ $a->strings["Collection Editor"] = "Sammlung-Editor";
$a->strings["Members"] = "Mitglieder";
$a->strings["All Connected Channels"] = "Alle verbundenen Kanäle";
$a->strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-$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 Connections"] = "Alle Verbindungen";
$a->strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
$a->strings["Site"] = "Seite";
$a->strings["Users"] = "Benutzer";
@@ -1040,8 +946,8 @@ $a->strings["Server"] = "Server";
$a->strings["DB updates"] = "DB-Aktualisierungen";
$a->strings["Logs"] = "Protokolle";
$a->strings["Plugin Features"] = "Plug-In Funktionen";
-$a->strings["User registrations waiting for confirmation"] = "Nutzer Anmeldungen die auf Bestätigung warten";
-$a->strings["Message queues"] = "Nachrichten Warteschlange";
+$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
+$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
$a->strings["Administration"] = "Administration";
$a->strings["Summary"] = "Zusammenfassung";
$a->strings["Registered users"] = "Registrierte Benutzer";
@@ -1049,7 +955,8 @@ $a->strings["Pending registrations"] = "Ausstehende Registrierungen";
$a->strings["Version"] = "Version";
$a->strings["Active plugins"] = "Aktive Plug-Ins";
$a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
-$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility Theme vorhanden";
+$a->strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
+$a->strings["No special theme for accessibility"] = "Kein spezielles Accessibility-Theme vorhanden";
$a->strings["Closed"] = "Geschlossen";
$a->strings["Requires approval"] = "Genehmigung erforderlich";
$a->strings["Open"] = "Offen";
@@ -1063,59 +970,59 @@ $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["Administrator Information"] = "Administrator-Informationen";
+$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. 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 - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standard System-Theme - kann durch Nutzerprofile überschieben werden - <a href='#' id='cnftheme'>Theme.Einstellungen ändern</a>";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
$a->strings["Mobile system theme"] = "Mobile System-Theme:";
$a->strings["Theme for mobile devices"] = "Theme für mobile Geräte";
-$a->strings["Accessibility system theme"] = "Accessibility System-Theme";
-$a->strings["Accessibility theme"] = "Accessibility Theme";
+$a->strings["Accessibility system theme"] = "Accessibility-System-Theme";
+$a->strings["Accessibility theme"] = "Accessibility-Theme";
$a->strings["Channel to use for this website's static pages"] = "Kanal für die statischen Seiten dieser Webseite verwenden";
$a->strings["Site Channel"] = "Seiten Kanal";
$a->strings["Maximum image size"] = "Maximale Bildgröße";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe in Bytes von hochgeladenen Bildern. Standard ist 0, was keine Einschränkung bedeutet.";
-$a->strings["Register policy"] = "Registrierungsmethode";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung).";
+$a->strings["Register policy"] = "Registrierungsrichtlinie";
$a->strings["Access policy"] = "Zugangsrichtlinien";
$a->strings["Register text"] = "Registrierungstext";
-$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
-$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach X Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourchen auf das Pollen von externen Seiten wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit.";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
+$a->strings["Accounts abandoned after x days"] = "Konten gelten nach X Tagen als unbenutzt";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit.";
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "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.";
$a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist.";
$a->strings["Force publish"] = "Veröffentlichung erzwingen";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
$a->strings["No login on Homepage"] = "Kein Login auf der Homepage";
-$a->strings["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)."] = "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.";
+$a->strings["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)."] = "Ktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört.";
$a->strings["Proxy user"] = "Proxy Benutzer";
$a->strings["Proxy URL"] = "Proxy URL";
$a->strings["Network timeout"] = "Netzwerk-Timeout";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen).";
$a->strings["Delivery interval"] = "Auslieferung Intervall";
-$a->strings["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."] = "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.";
+$a->strings["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."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl 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.";
$a->strings["Poll interval"] = "Abfrageintervall";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet.";
-$a->strings["Maximum Load Average"] = "Maximum Load Average";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet.";
+$a->strings["Maximum Load Average"] = "Maximales Load Average";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
$a->strings["No server found"] = "Kein Server gefunden";
$a->strings["ID"] = "ID";
$a->strings["for channel"] = "für Kanal";
$a->strings["on server"] = "auf Server";
$a->strings["Status"] = "Status";
$a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
-$a->strings["Executing %s failed. Check system logs."] = "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs.";
-$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich angewandt.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war.";
-$a->strings["Update function %s could not be found."] = "Update Funktion %s konnte nicht gefunden werden.";
+$a->strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
+$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
+$a->strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
$a->strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
$a->strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
-$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)";
-$a->strings["Attempt to execute this update step automatically"] = "Versuche diesen Updateschritt automatisch anzuwenden";
+$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
+$a->strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
$a->strings["%s user blocked/unblocked"] = array(
0 => "%s Nutzer blockiert/freigegeben",
1 => "%s Nutzer blockiert/freigegeben",
@@ -1129,7 +1036,7 @@ $a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
$a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben";
$a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert";
$a->strings["select all"] = "Alle auswählen";
-$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
+$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten";
$a->strings["Request date"] = "Antragsdatum";
$a->strings["No registrations."] = "Keine Registrierungen.";
$a->strings["Approve"] = "Genehmigen";
@@ -1140,8 +1047,8 @@ $a->strings["Register date"] = "Registrierungs-Datum";
$a->strings["Last login"] = "Letzte Anmeldung";
$a->strings["Expires"] = "Verfällt";
$a->strings["Service Class"] = "Service-Klasse";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "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?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?";
$a->strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
$a->strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
$a->strings["Disable"] = "Deaktivieren";
@@ -1157,9 +1064,9 @@ $a->strings["Log settings updated."] = "Protokoll-Einstellungen aktualisiert.";
$a->strings["Clear"] = "Leeren";
$a->strings["Debugging"] = "Debugging";
$a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis.";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis.";
$a->strings["Log level"] = "Protokollstufe";
-$a->strings["- select -"] = "-auswählen-";
+$a->strings["- select -"] = "– auswählen –";
$a->strings["Welcome to %s"] = "Willkommen auf %s";
$a->strings["Item not found"] = "Element nicht gefunden";
$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
@@ -1173,15 +1080,15 @@ $a->strings["Finding:"] = "Ergebnisse:";
$a->strings["next page"] = "nächste Seite";
$a->strings["previous page"] = "vorige Seite";
$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-$a->strings["Could not access contact record."] = "Konnte auf den Kontakteintrag nicht zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das gewählte Profil nicht finden.";
+$a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
+$a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
$a->strings["Connection updated."] = "Verbindung aktualisiert.";
$a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
-$a->strings["Could not access address book record."] = "Konnte nicht auf den Eintrag im Adressbuch zugreifen.";
+$a->strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
$a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
$a->strings["Channel has been blocked"] = "Kanal blockiert";
-$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch Parameter nicht setzen.";
+$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
$a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
$a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
$a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
@@ -1191,51 +1098,51 @@ $a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
$a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
$a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["View %s's profile"] = "%s's Profil ansehen";
-$a->strings["Refresh Permissions"] = "Zugriffsrechte auffrischen";
+$a->strings["View %s's profile"] = "%ss Profil ansehen";
+$a->strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
$a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
$a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
$a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
-$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder frei geben";
+$a->strings["Block or Unblock this connection"] = "Verbindung blockieren oder freigeben";
$a->strings["Unignore"] = "Nicht ignorieren";
$a->strings["Ignore"] = "Ignorieren";
$a->strings["Ignore or Unignore this connection"] = "Verbindung ignorieren oder wieder beachten";
$a->strings["Unarchive"] = "Aus Archiv zurückholen";
$a->strings["Archive"] = "Archivieren";
-$a->strings["Archive or Unarchive this connection"] = "Archiviere diese Verbindung oder hole sie aus dem Archiv zurück";
-$a->strings["Unhide"] = "aufdecken";
-$a->strings["Hide"] = "Verbergen";
-$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder aufdecken";
+$a->strings["Archive or Unarchive this connection"] = "Verbindung archivieren oder aus dem Archiv zurückholen";
+$a->strings["Unhide"] = "Wieder sichtbar machen";
+$a->strings["Hide"] = "Verstecken";
+$a->strings["Hide or Unhide this connection"] = "Diese Verbindung verstecken oder wieder sichtbar machen";
$a->strings["Delete this connection"] = "Verbindung löschen";
$a->strings["Unknown"] = "Unbekannt";
$a->strings["Approve this connection"] = "Verbindung genehmigen";
-$a->strings["Accept connection to allow communication"] = "Aktzeptiere die Verbindung um Kommunikation zu ermöglichen";
+$a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
$a->strings["Automatic Permissions Settings"] = "Automatische Berechtigungs-Einstellungen";
$a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
-$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wenn eine Kanal-Vorstellung empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt und der Anfrage wird stattgegeben. Verlasse diese Seite, wenn du dieses Feature nicht verwanden möchtest.";
-$a->strings["Slide to adjust your degree of friendship"] = "Schieben um den Grad der Freundschaft zu wählen";
-$a->strings["inherited"] = "Geerbt";
-$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffseinstellungen.";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von deinen <a href=\"settings\">Privatsphären Einstellungen</a> könnte dies angebracht sein, eventuell solltest du aber die \"Erweiterte Zugriffsrechte\" überprüfen.";
+$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wenn eine Verbindungsanfrage empfangen wird, werden die hier getroffenen Einstellungen automatisch angewandt, und die Anfrage wird genehmigt. Verlasse diese Seite, wenn Du diese Funktion nicht verwenden möchtest.";
+$a->strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
+$a->strings["inherited"] = "geerbt";
+$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffsrechte!";
+$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen.";
$a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
$a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
-$a->strings["Edit contact notes"] = "Kontaktnotizen editieren";
+$a->strings["Edit contact notes"] = "Kontaktnotizen bearbeiten";
$a->strings["Their Settings"] = "Deren Einstellungen";
$a->strings["My Settings"] = "Meine Einstellungen";
$a->strings["Forum Members"] = "Forum Mitglieder";
$a->strings["Soapbox"] = "Marktschreier";
-$a->strings["Full Sharing (typical social network permissions)"] = "";
-$a->strings["Cautious Sharing "] = "";
-$a->strings["Follow Only"] = "Nur Folgen";
-$a->strings["Individual Permissions"] = "Individuelle Zugriffseinstellungen";
-$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "";
-$a->strings["Advanced Permissions"] = "Erweiterte Zugriffsrechte";
-$a->strings["Simple Permissions (select one and submit)"] = "";
-$a->strings["Visit %s's profile - %s"] = "%s's Profil besuchen - %s";
-$a->strings["Block/Unblock contact"] = "Geblockt Status ein- / ausschalten";
+$a->strings["Full Sharing (typical social network permissions)"] = "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)";
+$a->strings["Cautious Sharing "] = "Vorsichtiges Teilen";
+$a->strings["Follow Only"] = "Nur folgen";
+$a->strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
+$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Einige Berechtigungen werden von den <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen.";
+$a->strings["Advanced Permissions"] = "Zugriffsrechte für Fortgeschrittene";
+$a->strings["Simple Permissions (select one and submit)"] = "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)";
+$a->strings["Visit %s's profile - %s"] = "%ss Profil besuchen - %s";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freigeben";
$a->strings["Ignore contact"] = "Kontakt ignorieren";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["Repair URL settings"] = "URL-Einstellungen reparieren";
$a->strings["View conversations"] = "Unterhaltungen anzeigen";
$a->strings["Delete contact"] = "Kontakt löschen";
$a->strings["Last update:"] = "Letzte Aktualisierung:";
@@ -1247,9 +1154,9 @@ $a->strings["Currently archived"] = "Derzeit archiviert";
$a->strings["Currently pending"] = "Derzeit anstehend";
$a->strings["Hide this contact from others"] = "Diese Verbindung vor den anderen verbergen.";
$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>können</strong> immer noch sichtbar sein";
-$a->strings["Layout Help"] = "Layout Hilfe";
-$a->strings["Help with this feature"] = "Hilfe zu diesem Feature";
-$a->strings["Layout Name"] = "Layout Name";
+$a->strings["Layout Help"] = "Layout-Hilfe";
+$a->strings["Help with this feature"] = "Hilfe zu dieser Funktion";
+$a->strings["Layout Name"] = "Layout-Name";
$a->strings["Help:"] = "Hilfe:";
$a->strings["Not Found"] = "Nicht gefunden";
$a->strings["Page not found."] = "Seite nicht gefunden.";
@@ -1271,11 +1178,11 @@ $a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden
$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
$a->strings["Marital Status"] = "Familienstand";
$a->strings["Romantic Partner"] = "Romantische Partner";
-$a->strings["Likes"] = "Gefällt-mir";
-$a->strings["Dislikes"] = "Gefällt-mir-nicht";
+$a->strings["Likes"] = "Gefällt";
+$a->strings["Dislikes"] = "Gefällt nicht";
$a->strings["Work/Employment"] = "Arbeit/Anstellung";
$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Anscihten";
+$a->strings["Political Views"] = "Politische Ansichten";
$a->strings["Gender"] = "Geschlecht";
$a->strings["Sexual Preference"] = "Sexuelle Orientierung";
$a->strings["Homepage"] = "Webseite";
@@ -1283,7 +1190,7 @@ $a->strings["Interests"] = "Hobbys/Interessen";
$a->strings["Address"] = "Adresse";
$a->strings["Location"] = "Ort";
$a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Deine Kontaktliste vor Betrachtern dieses Profils verbergen?";
$a->strings["Edit Profile Details"] = "Bearbeite Profil-Details";
$a->strings["View this profile"] = "Dieses Profil ansehen";
$a->strings["Change Profile Photo"] = "Profilfoto ändern";
@@ -1292,14 +1199,14 @@ $a->strings["Clone this profile"] = "Dieses Profil klonen";
$a->strings["Delete this profile"] = "Dieses Profil löschen";
$a->strings["Profile Name:"] = "Profilname:";
$a->strings["Your Full Name:"] = "Dein voller Name:";
-$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Title/Description:"] = "Titel/Stellenbeschreibung:";
$a->strings["Your Gender:"] = "Dein Geschlecht:";
$a->strings["Birthday (%s):"] = "Geburtstag (%s):";
$a->strings["Street Address:"] = "Straße und Hausnummer:";
$a->strings["Locality/City:"] = "Wohnort:";
$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
$a->strings["Country:"] = "Land:";
-$a->strings["Region/State:"] = "Region/Bundesstaat";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
@@ -1307,9 +1214,9 @@ $a->strings["Since [date]:"] = "Seit [Datum]:";
$a->strings["Homepage URL:"] = "Homepage URL:";
$a->strings["Religious Views:"] = "Religiöse Ansichten:";
$a->strings["Keywords:"] = "Schlüsselwörter:";
-$a->strings["Example: fishing photography software"] = "Beispiel: fischen Fotografie Software";
-$a->strings["Used in directory listings"] = "Wird in Verzeichnis Auflistungen verwendet";
-$a->strings["Tell us about yourself..."] = "Erzähl uns ein wenig von Dir...";
+$a->strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
+$a->strings["Used in directory listings"] = "Wird in Verzeichnis-Auflistungen verwendet";
+$a->strings["Tell us about yourself..."] = "Erzähle uns ein wenig von Dir …";
$a->strings["Hobbies/Interests"] = "Hobbys/Interessen";
$a->strings["Contact information and Social Networks"] = "Kontaktinformation und soziale Netzwerke";
$a->strings["My other channels"] = "Meine anderen Kanäle";
@@ -1320,165 +1227,267 @@ $a->strings["Film/dance/culture/entertainment"] = "Film/Tanz/Kultur/Unterhaltung
$a->strings["Love/romance"] = "Liebe/Romantik";
$a->strings["Work/employment"] = "Arbeit/Anstellung";
$a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden im Internet sichtbar sein.";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Das ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden im Internet sichtbar sein.";
$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
$a->strings["Add profile things"] = "Profil-Dinge hinzufügen";
-$a->strings["Include desirable objects in your profile"] = "binde begehrenswerte Dinge in dein Profil ein";
+$a->strings["Include desirable objects in your profile"] = "Binde begehrenswerte Dinge in Dein Profil ein";
$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["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server 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["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
$a->strings["Source created."] = "Quelle erstellt.";
$a->strings["Source updated."] = "Quelle aktualisiert.";
$a->strings["*"] = "*";
-$a->strings["Manage remote sources of content for your channel."] = "Entfernte Quellen von Inhalten deines Kanals verwalten.";
+$a->strings["Manage remote sources of content for your channel."] = "Quellen von Inhalten Deines Kanals verwalten.";
$a->strings["New Source"] = "Neue Quelle";
$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importiere alle oder ausgewählte Inhalte des folgenden Kanals in diesen Kanal und verteile sie gemäß der Einstellungen dieses Kanals.";
-$a->strings["Only import content with these words (one per line)"] = "Importiere ausschließlich Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
-$a->strings["Leave blank to import all public content"] = "Leer lassen um alle öffentlichen Beiträge zu importieren";
+$a->strings["Only import content with these words (one per line)"] = "Importiere nur Beiträge, die folgende Wörter (eines pro Zeile) enthalten";
+$a->strings["Leave blank to import all public content"] = "Leer lassen, um alle öffentlichen Beiträge zu importieren";
$a->strings["Channel Name"] = "Name des Kanals";
$a->strings["Source not found."] = "Quelle nicht gefunden.";
$a->strings["Edit Source"] = "Quelle bearbeiten";
$a->strings["Delete Source"] = "Quelle löschen";
$a->strings["Source removed"] = "Quelle gelöscht";
$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
-$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
+$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
$a->strings["Visible to:"] = "Sichtbar für:";
$a->strings["Hub not found."] = "Server nicht gefunden.";
$a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation";
$a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten URL nicht erreichen. Möglicherweise ein Problem mit dem SSL Zertifikat oder dem DNS.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS.";
$a->strings["Could not create table."] = "Kann Tabelle nicht erstellen.";
-$a->strings["Your site database has been installed."] = "Die Datenbank deiner Seite wurde installiert.";
-$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst du die Datei \"install/database.sql\" händisch mit phpmyadmin oder mysql importieren.";
+$a->strings["Your site database has been installed."] = "Die Datenbank Deines Servers wurde installiert.";
+$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Eventuell musst Du die Datei \"install/database.sql\" per Hand mit phpmyadmin oder mysql importieren.";
$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \"install/INSTALL.txt\".";
$a->strings["System check"] = "Systemprüfung";
$a->strings["Check again"] = "Bitte nochmal prüfen";
$a->strings["Database connection"] = "Datenbank Verbindung";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red Matrix installieren zu können, müssen wir wissen wie wir deine Datenbank kontaktieren können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere deinen Hosting Provider oder den Administrator der Seite wenn du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor du fortfährst.";
+$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst.";
$a->strings["Database Server Name"] = "Datenbank-Servername";
$a->strings["Default is localhost"] = "Standard ist localhost";
$a->strings["Database Port"] = "Datenbank-Port";
-$a->strings["Communication port number - use 0 for default"] = "Port Nummer zur Kommunikation - verwende 0 für die Standardeinstellung:";
+$a->strings["Communication port number - use 0 for default"] = "Port-Nummer für die Kommunikation – verwende 0 für die Standardeinstellung";
$a->strings["Database Login Name"] = "Datenbank-Benutzername";
$a->strings["Database Login Password"] = "Datenbank-Kennwort";
$a->strings["Database Name"] = "Datenbank-Name";
$a->strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die Email-Adresse deines Accounts muss dieser Adresse entsprechen, damit du Zugriff zum Admin Panel erhältst.";
-$a->strings["Website URL"] = "Webseiten URL";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+$a->strings["Website URL"] = "Server-URL";
$a->strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
-$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für deine Website";
+$a->strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
$a->strings["Site settings"] = "Seiteneinstellungen";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen Version von PHP nicht im PATH des Servers finden.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Solltest du keine Kommandozeilen Version von PHP auf dem Server installiert haben wirst du nicht in der Lage sein Hintergrundprozesse via cron auszuführen.";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte die Kommandozeilen-Version von PHP nicht im PATH des Web-Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Ohne Kommandozeilen-Version von PHP auf dem Server wirst Du nicht in der Lage sein, Hintergrundprozesse via cron auszuführen.";
$a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP Interpreter an. Du kannst dieses Felds frei lassen und mit der Installation fortfahren.";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
$a->strings["Command line PHP"] = "PHP Befehlszeile";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilen Version von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Dies wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der Lage Schlüssel für die Verschlüsselung zu erzeugen.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn du Windows verwendest, siehe http://www.php.net/manual/en/openssl.installation.php für eine Installationsanleitung.";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
$a->strings["Generate encryption keys"] = "Verschlüsselungsschlüssel generieren";
-$a->strings["libCurl PHP module"] = "libCurl PHP Modul";
-$a->strings["GD graphics PHP module"] = "GD Graphik PHP Modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP Modul";
-$a->strings["mysqli PHP module"] = "mysqli PHP Modul";
-$a->strings["mb_string PHP module"] = "mb_string PHP Modul";
-$a->strings["mcrypt PHP module"] = "mcrypt PHP Modul";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite Modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache Modul mod-rewrite wird benötigt ist aber nicht installiert.";
+$a->strings["libCurl PHP module"] = "libCurl-PHP-Modul";
+$a->strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
+$a->strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
+$a->strings["mysqli PHP module"] = "mysqli-PHP-Modul";
+$a->strings["mb_string PHP module"] = "mb_string-PHP-Modul";
+$a->strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
+$a->strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: das PHP Modul libCURL wird benütigt ist aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: das PHP Modul GD Grafik mit JPEG Unterstützung wird benötigt ist aber nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: das OpenSSL PHP Modul wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: das PHP Modul mysqli wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: das PHP Modul mb_string wird benötigt ist aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: das PHP Modul mcrypt wird benötigt ist aber nicht installiert.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist es aber nicht.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt dies daran, dass der Nutzer unter dem der Web-Server läuft keine Rechte zum Schreiben in dem Verzeichnis hat - selbst wenn du das kannst.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss des Vorgangs wird ein Text generiert, den du unter dem Dateinamen .htconfig.php im Stammverzeichnis deiner Red Installation speichern.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das PHP-Modul mysqli wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Rechte Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt überspringen und die Installation manuell vornehmen. Lies dazu die Datei install/INSTALL.txt.";
$a->strings[".htconfig.php is writable"] = ".htconfig.php ist beschreibbar";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP um die Darstellung zu beschleunigen.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver schreib Zugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red Stammverzeichnisses haben.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Zugriff zum Schreiben auf dieses Verzeichnis hat.";
-$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht dem Vorlagen (.tpl) die in diesem Verzeichnis liegen.";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red verwendet Smarty3 um Vorlagen für die Webdarstellung zu übersetzen. Smarty3 übersetzt diese Vorlagen nach PHP, um die Darstellung zu beschleunigen.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Red top level folder."] = "Um die übersetzten Vorlagen speichern zu können muss der Webserver Schreibzugriff auf das Verzeichnis view/tpl/smarty3/ unterhalb des Red-Stammverzeichnisses haben.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Webserver läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
+$a->strings["Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: Als Sicherheitsvorkehrung solltest Du dem Webserver nur Schreib-Zugriff auf das Verzeichnis view/tpl/smarty3 geben, nicht auf die Vorlagen (.tpl-Dateien) in view/tpl/ .";
$a->strings["view/tpl/smarty3 is writable"] = "view/tpl/smarty3 ist beschreibbar";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das store Verzeichnis um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red Stammverzeichnis.";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses";
$a->strings["store is writable"] = "store ist schreibbar";
$a->strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder schalte HTTPS ab um auf diese Seite zuzugreifen.";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite funktioniert in der .htaccess nicht. Überprüfe deine Server-Konfiguration.";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite via .htaccess funktioniert nicht. Überprüfe Deine Server-Konfiguration.";
$a->strings["Url rewrite is working"] = "Url rewrite funktioniert";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank Konfigurationsdatei \".htconfig.php\" konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
-$a->strings["Errors encountered creating database tables."] = "Fehler während des Anlegens der Datenbank Tabellen aufgetreten.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Datenbank-Konfigurationsdatei „.htconfig.php“ konnte nicht geschrieben werden. Bitte verwende den unten angegebenen Text, um die Konfigurationsdatei im Stammverzeichnis des Webservers anzulegen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten.";
$a->strings["<h1>What next</h1>"] = "<h1>Was als Nächstes</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob für den Poller einrichten.";
$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["Project Donations"] = "Projekt Spenden";
+$a->strings["<p>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</p>"] = "";
+$a->strings["<p>or</p>"] = "<p>oder</p>";
+$a->strings["Recurring Donation Options"] = "";
$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 <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren.";
+$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a>, 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, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["Site Administrators"] = "Administratoren";
$a->strings["Add a Channel"] = "Kanal hinzufügen";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um Social Network-Profile, Blogs, Gesprächsgruppen und Foren, Promi-Seiten und viel mehr zu erfassen. Du kannst so viele Kanäle erstellen, wie es der Betreiber deiner Seite zulässt.";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" ";
-$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznahmen";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine einfach zu erinnernde Kanal-Adresse (ähnlich einer E-Mail Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
-$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Ort";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Ein Kanal ist Deine eigene Sammlung von verbundenen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deiner Seite zulässt.";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
+$a->strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst.";
+$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server";
$a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
-$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts veranlasst. Rufe bitte Deine E-Mails ab.";
-$a->strings["Site Member (%s)"] = "Seiten Mitglied (%s)";
-$a->strings["Password reset requested at %s"] = "Passwort Rücksetzung auf %s angefordert";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Es könnte sein, dass du vorher bereits eine Anfrage eingereicht hast.) Passwort Anforderung fehlgeschlagen.";
+$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
+$a->strings["Site Member (%s)"] = "Nutzer (%s)";
+$a->strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
$a->strings["Password Reset"] = "Zurücksetzen des Kennworts";
$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
$a->strings["Your new password is"] = "Dein neues Passwort lautet";
-$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
+$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
$a->strings["click here to login"] = "Klicke hier, um dich anzumelden";
$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
-$a->strings["Your password has changed at %s"] = "Auf %s wurde dein Passwort geändert";
+$a->strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
$a->strings["Forgot your Password?"] = "Kennwort vergessen?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
$a->strings["Email Address"] = "E-Mail Adresse";
$a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Name is required"] = "Name ist erforderlich";
+$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
+$a->strings["Update"] = "Aktualisieren";
+$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
+$a->strings["Password changed."] = "Kennwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal.";
+$a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
+$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
+$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Anwendung hinzufügen";
+$a->strings["Name"] = "Name";
+$a->strings["Name of application"] = "Name der Anwendung";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleitung";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "Umleitungs-URl – lasse das leer, wenn Deine Anwendung es nicht explizit erfordert";
+$a->strings["Icon url"] = "Symbol-URL";
+$a->strings["Optional"] = "Optional";
+$a->strings["You can't edit this application."] = "Diese Anwendung kann nicht bearbeitet werden.";
+$a->strings["Connected Apps"] = "Verbundene Apps";
+$a->strings["Client key starts with"] = "Client key beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Authorisierung aufheben";
+$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
+$a->strings["Feature Settings"] = "Funktions-Einstellungen";
+$a->strings["Account Settings"] = "Konto-Einstellungen";
+$a->strings["Password Settings"] = "Kennwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
+$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Remove Account"] = "Konto entfernen";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
+$a->strings["Additional Features"] = "Zusätzliche Funktionen";
+$a->strings["Connector Settings"] = "Connector-Einstellungen";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Anzeige-Theme:";
+$a->strings["Mobile Theme:"] = "Mobile Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
+$a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
+$a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
+$a->strings["View remote profiles as webpages"] = "";
+$a->strings["By default open in a sub-window of your own site"] = "";
+$a->strings["Nobody except yourself"] = "Niemand außer Dir selbst";
+$a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
+$a->strings["Anybody in your address book"] = "Jeder aus Ihrem Adressbuch";
+$a->strings["Anybody on this website"] = "Jeder auf dieser Website";
+$a->strings["Anybody in this network"] = "Jeder in diesem Netzwerk";
+$a->strings["Anybody on the internet"] = "Jeder im Internet";
+$a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["or"] = "oder";
+$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
+$a->strings["Channel Settings"] = "Kanal-Einstellungen";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Your Timezone:"] = "Ihre Zeitzone:";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+$a->strings["Adult Content"] = "Nicht jugendfreie Inhalte";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)";
+$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents displaying in your profile that you are online"] = "Verhindert die Anzeige Deines Online-Status in deinem Profil";
+$a->strings["Simple Privacy Settings:"] = "Einfache Privatsphäre-Einstellungen";
+$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>";
+$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Typisch – <em>Default öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>";
+$a->strings["Private - <em>default private, never open or public</em>"] = "Private – <em>Default privat, nie offen oder öffentlich</em>";
+$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Blockiert – <em>Alle per Default blockiert</em>";
+$a->strings["Advanced Privacy Settings"] = "Fortgeschrittene Privatsphäre-Einstellungen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Kontaktanfragen pro Tag:";
+$a->strings["May reduce spam activity"] = "Kann die Spam-Aktivität verringern";
+$a->strings["Default Post Permissions"] = "Standardeinstellungen für Beitrags-Zugriffsrechte";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:";
+$a->strings["Useful to reduce spamming"] = "Nützlich, um Spam zu verringern";
+$a->strings["Notification Settings"] = "Benachrichtigungs-Einstellungen";
+$a->strings["By default post a status message when:"] = "Sende standardmäßig Status-Nachrichten, wenn:";
+$a->strings["accepting a friend request"] = "Du eine Kontaktanfrage annimmst";
+$a->strings["joining a forum/community"] = "Du einem Forum beitrittst";
+$a->strings["making an <em>interesting</em> profile change"] = "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst";
+$a->strings["Send a notification email when:"] = "Eine E-Mail-Benachrichtigung senden, wenn:";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
+$a->strings["Your introductions are confirmed"] = "Deine Vorstellung bestätigt wurde.";
+$a->strings["Someone writes on your profile wall"] = "Jemand auf Deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "Jemand einen Beitrag kommentiert";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "Du einen Kontaktvorschlag erhältst";
+$a->strings["You are tagged in a post"] = "Du in einem Beitrag erwähnt wurdest";
+$a->strings["You are poked/prodded/etc. in a post"] = "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest";
+$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
+$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "";
$a->strings["Nothing to import."] = "Nichts zu importieren.";
$a->strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
$a->strings["Imported file is empty."] = "Die importierte Datei ist leer.";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann auf diesem System keinen duplizierten Kanal-Identifikator erzeugen. Import fehlgeschlagen.";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kann keinen doppelten Kanal-Identifikator auf diesem System erzeugen (Spitzname oder Hash schon belegt). Import fehlgeschlagen.";
$a->strings["Channel clone failed. Import failed."] = "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen.";
$a->strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
$a->strings["Import completed."] = "Import abgeschlossen.";
$a->strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
$a->strings["Import Channel"] = "Kanal importieren";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Verwende dieses Formular um einen existierenden Kanal von einem anderen Server/Hub zu importieren. Du kannst die Kanal-Identität vom alten Server/Hub über das Netzwerk erhalten oder über eine exportierte Sicherungskopie. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich.";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Red-Server zu importieren. Du kannst den Kanal direkt vom bisherigen Red-Server über das Netzwerk importieren oder eine exportierte Sicherheitskopie benutzen. Es werden ausschließlich die Identität und die Verbindungen/Beziehungen importiert. Das Importieren von Inhalten ist derzeit nicht möglich.";
$a->strings["File to Upload"] = "Hochzuladende Datei:";
-$a->strings["Or provide the old server/hub details"] = "Oder gib die Deteils deines alten Server/Hubs an";
-$a->strings["Your old identity address (xyz@example.com)"] = "Die alte Adresse der Identität (xyz@example.com)";
+$a->strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen Red-Servers ein";
+$a->strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
$a->strings["Your old login email address"] = "Ihre alte Login E-Mail Adresse";
$a->strings["Your old login password"] = "Ihr altes Login Kennwort";
-$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal welche Option du wählst, bitte lege fest, ob dieser Hub deine neue primäre Adresse sein soll oder ob dein alter Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Orten aus neue Dinge posten, aber nur einer kann die primäre Adresse deiner Dateien, Fotos und anderen Mediendaten sein.";
-$a->strings["Make this hub my primary location"] = "Dieser Hub ist mein primärer Server.";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von %2$.0f erlaubten Kanälen eingerichtet.";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal welche Option Du wählst, bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
+$a->strings["Make this hub my primary location"] = "Dieser Red-Server ist mein primärer Server.";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
$a->strings["Create a new channel"] = "Erzeuge neues Kanal";
$a->strings["Channel Manager"] = "Kanal-Manager";
$a->strings["Current Channel"] = "Aktueller Kanal";
-$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen deiner Kanäle aus um ihn zu verwenden.";
+$a->strings["Attach to one of your channels by selecting it."] = "Wähle einen Deiner Kanäle aus, um ihn zu verwenden.";
$a->strings["Default Channel"] = "Standard Kanal";
$a->strings["Make Default"] = "Zum Standard machen";
$a->strings["Total votes"] = "Stimmen gesamt";
-$a->strings["Average Rating"] = "durchschnittliche Bewertung";
+$a->strings["Average Rating"] = "Durchschnittliche Bewertung";
$a->strings["Profile Match"] = "Profil-Übereinstimmungen";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselbegriffe für den Abgleich gefunden. Bitte füge Schlüsselbegriffe zu deinem Standardprofil hinzu.";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
$a->strings["is interested in:"] = "interessiert sich für:";
$a->strings["No matches"] = "Keine Übereinstimmungen";
$a->strings["invalid target signature"] = "Ungültige Signatur des Ziels";
@@ -1494,18 +1503,18 @@ $a->strings["To:"] = "An:";
$a->strings["Subject:"] = "Betreff:";
$a->strings["Message not found."] = "Nachricht nicht gefunden.";
$a->strings["Delete message"] = "Nachricht löschen";
-$a->strings["Recall message"] = "Widerrufe die Nachricht";
+$a->strings["Recall message"] = "Nachricht widerrufen";
$a->strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
$a->strings["Private Conversation"] = "Private Unterhaltung";
$a->strings["Delete conversation"] = "Unterhaltung löschen";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst du von der Profilseite des Absenders antworten.";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
$a->strings["Send Reply"] = "Antwort senden";
$a->strings["Edit Layout"] = "Layout bearbeiten";
$a->strings["Delete layout?"] = "Layout löschen?";
$a->strings["Delete Layout"] = "Layout löschen";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das zurecht schneiden schlug fehl.";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden sollte das neue Foto nicht sofort angezeigt werden.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
$a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d";
$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
$a->strings["Photo not available."] = "Foto nicht verfügbar.";
@@ -1516,7 +1525,7 @@ $a->strings["Upload"] = "Hochladen";
$a->strings["skip this step"] = "diesen Schritt überspringen";
$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
$a->strings["Crop Image"] = "Bild zuschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte passe das Bild zur optimalen Anzeige an.";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
$a->strings["Done Editing"] = "Bearbeitung fertigstellen";
$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
@@ -1527,7 +1536,7 @@ $a->strings["Hidden"] = "Versteckt";
$a->strings["Archived"] = "Archiviert";
$a->strings["All"] = "Alle";
$a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen";
-$a->strings["Show pending (new) connections"] = "Zeige schwebende (neue) Verbindungen";
+$a->strings["Show pending (new) connections"] = "Zeige ausstehende (neue) Verbindungsanfragen";
$a->strings["Show all connections"] = "Zeige alle Verbindungen";
$a->strings["Unblocked"] = "Freigegeben";
$a->strings["Only show unblocked connections"] = "Zeige nur freigegebene Verbindungen";
@@ -1539,21 +1548,21 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
$a->strings["Edit contact"] = "Kontakt bearbeiten";
$a->strings["Search your connections"] = "Verbindungen durchsuchen";
$a->strings["Finding: "] = "Ergebnisse:";
-$a->strings["Invalid request identifier."] = "Ungültige Anfrage Identifikator.";
+$a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
$a->strings["Discard"] = "Verwerfen";
$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
$a->strings["System Notifications"] = "System-Benachrichtigungen";
-$a->strings["Block Name"] = "Block Name";
-$a->strings["Unable to find your hub."] = "Konnte den Hub nicht finden.";
+$a->strings["Block Name"] = "Block-Name";
+$a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
$a->strings["Post successful."] = "Veröffentlichung erfolgreich.";
$a->strings["Edit Webpage"] = "Webseite bearbeiten";
$a->strings["Delete webpage?"] = "Webseite löschen?";
$a->strings["Delete Webpage"] = "Webseite löschen";
$a->strings["Access to this profile has been restricted."] = "Der Zugang zu diesem Profil ist begrenzt.";
-$a->strings["Poke/Prod"] = "Anstupsen/Kuffen";
+$a->strings["Poke/Prod"] = "Anstupsen/Knuffen";
$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
$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["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["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
$a->strings["Not available."] = "Nicht verfügbar.";
@@ -1561,86 +1570,86 @@ $a->strings["Community"] = "Gemeinschaft";
$a->strings["No results."] = "Keine Ergebnisse.";
$a->strings["Contact not found."] = "Kontakt nicht gefunden";
$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden.";
-$a->strings["Suggest Friends"] = "Kontakte Vorschlagen";
+$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
$a->strings["Edit Block"] = "Block bearbeiten";
$a->strings["Delete block?"] = "Block löschen?";
$a->strings["Delete Block"] = "Block löschen";
$a->strings["Status: "] = "Status:";
-$a->strings["Sexual Preference: "] = "Sexuelle Vorlieben:";
+$a->strings["Sexual Preference: "] = "Sexuelle Ausrichtung:";
$a->strings["Homepage: "] = "Webseite:";
$a->strings["Hometown: "] = "Wohnort:";
$a->strings["About: "] = "Über:";
-$a->strings["Keywords: "] = "Schlüsselbegriffe:";
+$a->strings["Keywords: "] = "Schlüsselwörter:";
$a->strings["Permission Denied."] = "Zugriff verweigert.";
-$a->strings["File not found."] = "Datei nicht gefunden";
+$a->strings["File not found."] = "Datei nicht gefunden.";
$a->strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
$a->strings["Permissions"] = "Berechtigungen";
$a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzeichnisse einbinden";
$a->strings["Return to file list"] = "Zurück zur Dateiliste";
-$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen";
-$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen";
+$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
+$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
$a->strings["Download"] = "Download";
$a->strings["Used: "] = "Verwendet:";
$a->strings["[directory]"] = "[Verzeichnis]";
$a->strings["Limit: "] = "Limit:";
-$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["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
$a->strings["No messages."] = "Keine Nachrichten.";
$a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
-$a->strings["Public Sites"] = "Öffentliche Seiten";
-$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Seiten erlauben dir einen Account in der Red Matrix anzulegen. Alle Seiten der Matrix sind mit einander verbunden, so dass die Mitgliedschaft auf einer Seite die Mitgliedschaft auf einer beliebigen anderen Seite der Matrix beinhaltet. Es könnte sein, dass einige dieser Seiten Abonnements benötigen oder abgestufte Service-Pläne anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details diesbezüglich stehen.";
-$a->strings["Site URL"] = "URL der Seite";
-$a->strings["Access Type"] = "Zugangs Typ";
+$a->strings["Public Sites"] = "Öffentliche Server";
+$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen.";
+$a->strings["Site URL"] = "Server-URL";
+$a->strings["Access Type"] = "Zugangstyp";
$a->strings["Registration Policy"] = "Registrierungsrichtlinien";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl von Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Anmeldung fehlgeschlagen.";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf dieser Seite / diesem Hub benötigen Zustimmung durch den Administrator";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einer angeschlossenen Seite</a>";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
+$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
$a->strings["Terms of Service"] = "Nutzungsbedingungen";
$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-$a->strings["Please enter your invitation code"] = "Bitte trage deinen Einladungs-Code ein";
+$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
$a->strings["Your email address"] = "Ihre E-Mail Adresse";
$a->strings["Choose a password"] = "Passwort";
-$a->strings["Please re-enter your password"] = "Bitte gib dein Passwort noch einmal ein";
+$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
$a->strings["Please login."] = "Bitte melde dich an.";
-$a->strings["Remove This Channel"] = "Diesen Kanal löschen!";
-$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet ist dieser Prozess nicht widerrufbar.";
-$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung dein Passwort ein:";
+$a->strings["Remove This Channel"] = "Diesen Kanal löschen";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet kann dieser Prozess nicht rückgängig gemacht werden.";
+$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
$a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
-$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standartmäßig wird der Kanal nur auf diesem Knoten gelöscht, seine Klone verbleiben im Netzwerk";
-$a->strings["Remove Channel"] = "Kanal entfernen";
-$a->strings["Page owner information could not be retrieved."] = "Informationen über den Betreiber der Seite konnten nicht gefunden werden.";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
+$a->strings["Remove Channel"] = "Kanal löschen";
+$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
$a->strings["Album not found."] = "Album nicht gefunden.";
$a->strings["Delete Album"] = "Album löschen";
$a->strings["Delete Photo"] = "Foto löschen";
$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff auf dieses Foto wurde eingeschränkt.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes deines %2$.2f MBytes großen Bilder-Speichers.";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendets %1$.2f MBytes deines Foto-Speichers.";
+$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du benutzt %1$.2f MBytes Deines %2$.2f MBytes großen Bilder-Speichers.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.2f MBytes Deines Foto-Speichers.";
$a->strings["Upload Photos"] = "Fotos hochladen";
$a->strings["New album name: "] = "Name des neuen Albums:";
-$a->strings["or existing album name: "] = "oder bestehenden Album Namen:";
+$a->strings["or existing album name: "] = "Oder bestehender Album-Name:";
$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload senden";
-$a->strings["Contact Photos"] = "Kontakt Bilder";
+$a->strings["Contact Photos"] = "Kontakt-Bilder";
$a->strings["Edit Album"] = "Album bearbeiten";
-$a->strings["Show Newest First"] = "Zeige neueste zuerst";
-$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
+$a->strings["Show Newest First"] = "Zeige Neueste zuerst";
+$a->strings["Show Oldest First"] = "Zeige Älteste zuerst";
$a->strings["View Photo"] = "Foto ansehen";
$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
$a->strings["Photo not available"] = "Foto nicht verfügbar";
$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
$a->strings["View Full Size"] = "In voller Größe anzeigen";
$a->strings["Edit photo"] = "Foto bearbeiten";
-$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
-$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
+$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
$a->strings["New album name"] = "Name des neuen Albums:";
$a->strings["Caption"] = "Bildunterschrift";
$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
@@ -1649,16 +1658,16 @@ $a->strings["In This Photo:"] = "Auf diesem Foto:";
$a->strings["View Album"] = "Album ansehen";
$a->strings["Recent Photos"] = "Neueste Fotos";
$a->strings["Mood"] = "Laune";
-$a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden";
+$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
$a->strings["sent you a private message"] = "eine private Nachricht schicken";
$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
$a->strings["posted an event"] = "hat eine Veranstaltung veröffentlicht";
$a->strings["Scheme Default"] = "Standard-Schema";
-$a->strings["silver"] = "Silber";
+$a->strings["silver"] = "silbern";
$a->strings["Theme settings"] = "Theme-Einstellungen";
$a->strings["Set scheme"] = "Schema";
$a->strings["Navigation bar colour"] = "Farbe der Navigationsleiste";
-$a->strings["link colour"] = "Farbe der Verweise";
+$a->strings["link colour"] = "Farbe der Links";
$a->strings["Set font-colour for banner"] = "Farbe des Banners";
$a->strings["Set the background colour"] = "Hintergrundfarbe";
$a->strings["Set the background image"] = "Hintergrundbild";
@@ -1667,26 +1676,26 @@ $a->strings["Set the opacity of items"] = "Deckkraft von Beiträgen";
$a->strings["Set the basic colour for item icons"] = "Basisfarbe der Beitrags-Icons";
$a->strings["Set the hover colour for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger";
$a->strings["Set font-size for the entire application"] = "Schriftgröße für die ganze Applikation";
-$a->strings["Set font-size for posts and comments"] = "Wähle die Schriftgröße für Beiträge und Kommentare";
+$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare";
$a->strings["Set font-colour for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
$a->strings["Set radius of corners"] = "Ecken-Radius";
$a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
-$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Konversationsbereiche";
+$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Unterhaltungsbereiche";
$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)";
$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
$a->strings["Sloppy photo albums"] = "Schräge Fotoalben";
-$a->strings["Are you a clean desk or a messy desk person?"] = "Bist du jemand der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
$a->strings["Schema Default"] = "Standard-Schema";
$a->strings["Sans-Serif"] = "Sans-Serif";
$a->strings["Monospace"] = "Monospace";
$a->strings["Set font face"] = "Schriftart";
-$a->strings["Set iconset"] = "Iconset";
+$a->strings["Set iconset"] = "Icon-Set";
$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten (Default 15px 15px 15px)";
$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten (Default 5px 5px 5px)";
$a->strings["Set shadow colour, default #000"] = "Farbe der Schatten (Default #000)";
$a->strings["Set radius size, default 5px"] = "Ecken-Radius (Default 5px)";
-$a->strings["Set line-height for posts and comments"] = "Wähle die Zeilenhöhe in Beiträgen und Kommentaren";
+$a->strings["Set line-height for posts and comments"] = "Zeilenhöhe für Beiträge und Kommentare";
$a->strings["Set background image"] = "Hintergrundbild";
$a->strings["Set background colour"] = "Hintergrundfarbe";
$a->strings["Set section background image"] = "Hintergrundbild des mittleren Bereichs";
@@ -1698,7 +1707,7 @@ $a->strings["Set min-width for items. Default 240px"] = "Minimalbreite von Beit
$a->strings["Set the generic content wrapper width. Default 48%"] = "Breite des „generic content wrapper“ (Default 48%)";
$a->strings["Set colour of fonts - use hex"] = "Schriftfarbe (HEX)";
$a->strings["Set background-size element"] = "Größe des Hintergrund-Elements";
-$a->strings["Item opacity"] = "Opazität von Beiträgen";
+$a->strings["Item opacity"] = "Deckkraft von Beiträgen (z.B. 0.8)";
$a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen";
$a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite";
$a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste";
@@ -1713,10 +1722,10 @@ $a->strings["Header image"] = "Titelbild";
$a->strings["Header image only on profile pages"] = "Titelbild nur auf Profil-Seiten anzeigen";
$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
$a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account um Anwendungen und Dienste innerhalb der Red Matrix verwenden zu können.";
+$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können.";
$a->strings["Password"] = "Kennwort";
$a->strings["Remember me"] = "Angaben speichern";
$a->strings["Forgot your password?"] = "Passwort vergessen?";
$a->strings["permission denied"] = "Zugriff verweigert";
$a->strings["Got Zot?"] = "Haste schon Zot?";
-$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
+$a->strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
diff --git a/view/it/messages.po b/view/it/messages.po
index 372d5b099..6d05e46dd 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 00:03-0800\n"
-"PO-Revision-Date: 2014-02-07 16:52+0000\n"
+"POT-Creation-Date: 2014-02-14 00:02-0800\n"
+"PO-Revision-Date: 2014-02-19 20:51+0000\n"
"Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -23,6 +23,172 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
+msgid "Categories"
+msgstr "Categorie"
+
+#: ../../include/widgets.php:115 ../../include/widgets.php:155
+#: ../../include/Contact.php:104 ../../include/identity.php:628
+#: ../../mod/directory.php:184 ../../mod/match.php:62
+#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr "Entra in contatto"
+
+#: ../../include/widgets.php:117 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignora/nascondi"
+
+#: ../../include/widgets.php:123 ../../mod/connections.php:238
+msgid "Suggestions"
+msgstr "Suggerimenti"
+
+#: ../../include/widgets.php:124
+msgid "See more..."
+msgstr "Altro..."
+
+#: ../../include/widgets.php:146
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
+
+#: ../../include/widgets.php:152
+msgid "Add New Connection"
+msgstr "Aggiungi un contatto"
+
+#: ../../include/widgets.php:153
+msgid "Enter the channel address"
+msgstr "Scrivi l'indirizzo del canale"
+
+#: ../../include/widgets.php:154
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
+
+#: ../../include/widgets.php:171
+msgid "Notes"
+msgstr "Note"
+
+#: ../../include/widgets.php:173 ../../include/text.php:754
+#: ../../include/text.php:768 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Salva"
+
+#: ../../include/widgets.php:243
+msgid "Remove term"
+msgstr "Rimuovi termine"
+
+#: ../../include/widgets.php:252 ../../include/features.php:52
+msgid "Saved Searches"
+msgstr "Ricerche salvate"
+
+#: ../../include/widgets.php:253 ../../include/group.php:290
+msgid "add"
+msgstr "aggiungi"
+
+#: ../../include/widgets.php:283 ../../include/features.php:66
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Cartelle salvate"
+
+#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
+#: ../../include/contact_widgets.php:90
+msgid "Everything"
+msgstr "Tutto"
+
+#: ../../include/widgets.php:318 ../../include/items.php:3636
+msgid "Archives"
+msgstr "Archivi"
+
+#: ../../include/widgets.php:370
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: ../../include/widgets.php:371 ../../mod/connedit.php:389
+msgid "Me"
+msgstr "Io"
+
+#: ../../include/widgets.php:372 ../../mod/connedit.php:391
+msgid "Best Friends"
+msgstr "Buoni amici"
+
+#: ../../include/widgets.php:373 ../../include/identity.php:310
+#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
+msgid "Friends"
+msgstr "Amici"
+
+#: ../../include/widgets.php:374
+msgid "Co-workers"
+msgstr "Colleghi"
+
+#: ../../include/widgets.php:375 ../../mod/connedit.php:393
+msgid "Former Friends"
+msgstr "Ex amici"
+
+#: ../../include/widgets.php:376 ../../mod/connedit.php:394
+msgid "Acquaintances"
+msgstr "Conoscenti"
+
+#: ../../include/widgets.php:377
+msgid "Everybody"
+msgstr "Tutti"
+
+#: ../../include/widgets.php:409
+msgid "Account settings"
+msgstr "Impostazioni dell'account"
+
+#: ../../include/widgets.php:415
+msgid "Channel settings"
+msgstr "Impostazioni del canale"
+
+#: ../../include/widgets.php:421
+msgid "Additional features"
+msgstr "Funzionalità aggiuntive"
+
+#: ../../include/widgets.php:427
+msgid "Feature settings"
+msgstr "Impostazioni aggiuntive"
+
+#: ../../include/widgets.php:433
+msgid "Display settings"
+msgstr "Impostazioni grafiche"
+
+#: ../../include/widgets.php:439
+msgid "Connected apps"
+msgstr "App connesse"
+
+#: ../../include/widgets.php:445
+msgid "Export channel"
+msgstr "Esporta il canale"
+
+#: ../../include/widgets.php:457
+msgid "Automatic Permissions (Advanced)"
+msgstr "Permessi predefiniti (avanzato)"
+
+#: ../../include/widgets.php:467
+msgid "Premium Channel Settings"
+msgstr "Canale premium - impostazioni"
+
+#: ../../include/widgets.php:476 ../../include/features.php:43
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Sorgenti del canale"
+
+#: ../../include/widgets.php:487 ../../include/nav.php:181
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../../include/widgets.php:504
+msgid "Check Mail"
+msgstr "Controlla i messaggi"
+
+#: ../../include/widgets.php:509 ../../include/nav.php:172
+msgid "New Message"
+msgstr "Nuovo messaggio"
+
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chat attive"
+
#: ../../include/acl_selectors.php:235
msgid "Visible to everybody"
msgstr "Visibile a tutti"
@@ -140,7 +306,7 @@ msgstr "Pagine web"
#: ../../include/nav.php:85
msgid "Your webpages"
-msgstr "Le tue pagine"
+msgstr "Le tue pagine web"
#: ../../include/nav.php:89 ../../boot.php:1424
msgid "Login"
@@ -196,7 +362,7 @@ msgstr "Cerca"
msgid "Search site content"
msgstr "Cerca nel sito"
-#: ../../include/nav.php:142 ../../mod/directory.php:210
+#: ../../include/nav.php:142 ../../mod/directory.php:211
msgid "Directory"
msgstr "Tutti i canali"
@@ -276,10 +442,6 @@ msgstr "In arrivo"
msgid "Outbox"
msgstr "Inviati"
-#: ../../include/nav.php:172 ../../include/widgets.php:509
-msgid "New Message"
-msgstr "Nuovo messaggio"
-
#: ../../include/nav.php:175
msgid "Event Calendar"
msgstr "Calendario"
@@ -300,11 +462,6 @@ msgstr "Gestisci i canali"
msgid "Manage Your Channels"
msgstr "Gestisci i contatti dei tuoi canali"
-#: ../../include/nav.php:181 ../../include/widgets.php:487
-#: ../../mod/admin.php:837 ../../mod/admin.php:1042
-msgid "Settings"
-msgstr "Impostazioni"
-
#: ../../include/nav.php:181
msgid "Account/Channel Settings"
msgstr "Impostazioni account e canali"
@@ -372,11 +529,6 @@ msgstr[1] "%d contatti"
msgid "View Connections"
msgstr "Elenco contatti"
-#: ../../include/text.php:754 ../../include/text.php:768
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Salva"
-
#: ../../include/text.php:834
msgid "poke"
msgstr "poke"
@@ -665,157 +817,36 @@ msgstr "Layout"
msgid "Pages"
msgstr "Pagine"
-#: ../../include/widgets.php:29 ../../include/contact_widgets.php:87
-msgid "Categories"
-msgstr "Categorie"
-
-#: ../../include/widgets.php:115 ../../include/widgets.php:155
-#: ../../include/Contact.php:104 ../../include/identity.php:628
-#: ../../mod/directory.php:183 ../../mod/match.php:62
-#: ../../mod/dirprofile.php:170 ../../mod/suggest.php:51
-msgid "Connect"
-msgstr "Entra in contatto"
-
-#: ../../include/widgets.php:117 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
-msgstr "Ignora/nascondi"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:594
+#: ../../include/bbcode.php:597 ../../include/bbcode.php:602
+#: ../../include/bbcode.php:605 ../../include/bbcode.php:608
+#: ../../include/bbcode.php:611 ../../include/bbcode.php:616
+#: ../../include/bbcode.php:619 ../../include/bbcode.php:624
+#: ../../include/bbcode.php:627 ../../include/bbcode.php:630
+#: ../../include/bbcode.php:633
+msgid "Image/photo"
+msgstr "Immagine"
-#: ../../include/widgets.php:123 ../../mod/connections.php:238
-msgid "Suggestions"
-msgstr "Suggerimenti"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:644
+msgid "Encrypted content"
+msgstr "Contenuto crittografato"
-#: ../../include/widgets.php:124
-msgid "See more..."
-msgstr "Altro..."
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR code"
-#: ../../include/widgets.php:146
+#: ../../include/bbcode.php:213
#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse."
-
-#: ../../include/widgets.php:152
-msgid "Add New Connection"
-msgstr "Aggiungi un contatto"
-
-#: ../../include/widgets.php:153
-msgid "Enter the channel address"
-msgstr "Scrivi l'indirizzo del canale"
-
-#: ../../include/widgets.php:154
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
-
-#: ../../include/widgets.php:171
-msgid "Notes"
-msgstr "Note"
-
-#: ../../include/widgets.php:243
-msgid "Remove term"
-msgstr "Rimuovi termine"
-
-#: ../../include/widgets.php:252 ../../include/features.php:52
-msgid "Saved Searches"
-msgstr "Ricerche salvate"
-
-#: ../../include/widgets.php:253 ../../include/group.php:290
-msgid "add"
-msgstr "aggiungi"
-
-#: ../../include/widgets.php:283 ../../include/features.php:66
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
-msgstr "Cartelle salvate"
-
-#: ../../include/widgets.php:286 ../../include/contact_widgets.php:56
-#: ../../include/contact_widgets.php:90
-msgid "Everything"
-msgstr "Tutto"
-
-#: ../../include/widgets.php:318 ../../include/items.php:3613
-msgid "Archives"
-msgstr "Archivi"
-
-#: ../../include/widgets.php:370
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: ../../include/widgets.php:371 ../../mod/connedit.php:389
-msgid "Me"
-msgstr "Io"
-
-#: ../../include/widgets.php:372 ../../mod/connedit.php:391
-msgid "Best Friends"
-msgstr "Buoni amici"
-
-#: ../../include/widgets.php:373 ../../include/identity.php:310
-#: ../../include/profile_selectors.php:42 ../../mod/connedit.php:392
-msgid "Friends"
-msgstr "Amici"
-
-#: ../../include/widgets.php:374
-msgid "Co-workers"
-msgstr "Colleghi"
-
-#: ../../include/widgets.php:375 ../../mod/connedit.php:393
-msgid "Former Friends"
-msgstr "Ex amici"
-
-#: ../../include/widgets.php:376 ../../mod/connedit.php:394
-msgid "Acquaintances"
-msgstr "Conoscenti"
-
-#: ../../include/widgets.php:377
-msgid "Everybody"
-msgstr "Tutti"
-
-#: ../../include/widgets.php:409
-msgid "Account settings"
-msgstr "Impostazioni dell'account"
-
-#: ../../include/widgets.php:415
-msgid "Channel settings"
-msgstr "Impostazioni del canale"
-
-#: ../../include/widgets.php:421
-msgid "Additional features"
-msgstr "Funzionalità aggiuntive"
-
-#: ../../include/widgets.php:427
-msgid "Feature settings"
-msgstr "Impostazioni aggiuntive"
-
-#: ../../include/widgets.php:433
-msgid "Display settings"
-msgstr "Impostazioni grafiche"
-
-#: ../../include/widgets.php:439
-msgid "Connected apps"
-msgstr "App connesse"
-
-#: ../../include/widgets.php:445
-msgid "Export channel"
-msgstr "Esporta il canale"
-
-#: ../../include/widgets.php:457
-msgid "Automatic Permissions (Advanced)"
-msgstr "Permessi predefiniti (avanzato)"
-
-#: ../../include/widgets.php:467
-msgid "Premium Channel Settings"
-msgstr "Canale premium - impostazioni"
-
-#: ../../include/widgets.php:476 ../../include/features.php:43
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Sorgenti del canale"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s ha scritto %2$s seguente %3$s"
-#: ../../include/widgets.php:504
-msgid "Check Mail"
-msgstr "Controlla i messaggi"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "l'articolo"
-#: ../../include/widgets.php:585
-msgid "Chat Rooms"
-msgstr "Chat attive"
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:582
+msgid "$1 wrote:"
+msgstr "$1 ha scritto:"
#: ../../include/Contact.php:120
msgid "New window"
@@ -1215,7 +1246,7 @@ msgstr "Fine:"
#: ../../include/event.php:40 ../../include/identity.php:679
#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
+#: ../../mod/directory.php:157 ../../mod/dirprofile.php:111
msgid "Location:"
msgstr "Luogo:"
@@ -1258,12 +1289,12 @@ msgstr "Canali che non sono in un insieme"
msgid "Delete this item?"
msgstr "Eliminare questo elemento?"
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:546
-#: ../../mod/photos.php:989 ../../mod/photos.php:1076
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:547
+#: ../../mod/photos.php:993 ../../mod/photos.php:1080
msgid "Comment"
msgstr "Commento"
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:280
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:281
#: ../../include/contact_widgets.php:125
msgid "show more"
msgstr "mostra tutto"
@@ -1384,7 +1415,7 @@ msgstr "Non è stato possibile verificare l'articolo inserito."
#: ../../include/photo/photo_driver.php:637 ../../include/photos.php:51
#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225
#: ../../mod/profile_photo.php:336 ../../mod/photos.php:91
-#: ../../mod/photos.php:652 ../../mod/photos.php:674
+#: ../../mod/photos.php:656 ../../mod/photos.php:678
msgid "Profile Photos"
msgstr "Foto del profilo"
@@ -1393,34 +1424,33 @@ msgstr "Foto del profilo"
#: ../../include/attach.php:233 ../../include/attach.php:247
#: ../../include/attach.php:268 ../../include/attach.php:463
#: ../../include/attach.php:541 ../../include/chat.php:113
-#: ../../include/photos.php:15 ../../include/items.php:3492
-#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
-#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../include/photos.php:15 ../../include/items.php:3515
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:247
+#: ../../mod/thing.php:263 ../../mod/thing.php:298 ../../mod/invite.php:13
#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190
#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/settings.php:490
-#: ../../mod/chat.php:87 ../../mod/chat.php:92
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/delegate.php:6 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/viewsrc.php:12 ../../mod/editpost.php:13
-#: ../../mod/connedit.php:182 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:42 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/network.php:12 ../../mod/profiles.php:152
+#: ../../mod/api.php:31 ../../mod/bookmarks.php:46 ../../mod/chat.php:87
+#: ../../mod/chat.php:92 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
+#: ../../mod/mitem.php:73 ../../mod/group.php:9 ../../mod/viewsrc.php:12
+#: ../../mod/editpost.php:13 ../../mod/connedit.php:182
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/page.php:30
+#: ../../mod/page.php:80 ../../mod/network.php:12 ../../mod/profiles.php:152
#: ../../mod/profiles.php:453 ../../mod/sources.php:66 ../../mod/setup.php:200
#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/manage.php:6 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/connections.php:169
-#: ../../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/achievements.php:27 ../../mod/settings.php:493
+#: ../../mod/manage.php:6 ../../mod/mail.php:108 ../../mod/editlayout.php:48
+#: ../../mod/profile_photo.php:187 ../../mod/profile_photo.php:200
+#: ../../mod/connections.php:169 ../../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/filestorage.php:10
#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
#: ../../mod/filestorage.php:98 ../../mod/suggest.php:26
#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/authtest.php:13 ../../mod/photos.php:68 ../../mod/photos.php:526
#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:351
msgid "Permission denied."
msgstr "Permesso negato."
@@ -1483,37 +1513,6 @@ msgstr "mkdir fallito."
msgid "database storage failed."
msgstr "scrittura su database fallita."
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:587
-#: ../../include/bbcode.php:590 ../../include/bbcode.php:595
-#: ../../include/bbcode.php:598 ../../include/bbcode.php:601
-#: ../../include/bbcode.php:604 ../../include/bbcode.php:609
-#: ../../include/bbcode.php:612 ../../include/bbcode.php:617
-#: ../../include/bbcode.php:620 ../../include/bbcode.php:623
-#: ../../include/bbcode.php:626
-msgid "Image/photo"
-msgstr "Immagine"
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:637
-msgid "Encrypted content"
-msgstr "Contenuto crittografato"
-
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr "QR code"
-
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s ha scritto %2$s seguente %3$s"
-
-#: ../../include/bbcode.php:215
-msgid "post"
-msgstr "l'articolo"
-
-#: ../../include/bbcode.php:555 ../../include/bbcode.php:575
-msgid "$1 wrote:"
-msgstr "$1 ha scritto:"
-
#: ../../include/bookmarks.php:31
#, php-format
msgid "%1$s's bookmarks"
@@ -1553,9 +1552,9 @@ msgid "Select"
msgstr "Seleziona"
#: ../../include/conversation.php:632 ../../include/ItemObject.php:108
-#: ../../mod/thing.php:230 ../../mod/settings.php:576 ../../mod/group.php:176
-#: ../../mod/admin.php:745 ../../mod/connedit.php:359
-#: ../../mod/filestorage.php:171 ../../mod/photos.php:1040
+#: ../../mod/thing.php:236 ../../mod/group.php:176 ../../mod/admin.php:745
+#: ../../mod/connedit.php:359 ../../mod/settings.php:579
+#: ../../mod/filestorage.php:171 ../../mod/photos.php:1044
msgid "Delete"
msgstr "Elimina"
@@ -1596,10 +1595,10 @@ msgid "View in context"
msgstr "Vedi nel contesto"
#: ../../include/conversation.php:707 ../../include/conversation.php:1120
-#: ../../include/ItemObject.php:258 ../../mod/editpost.php:112
+#: ../../include/ItemObject.php:259 ../../mod/editpost.php:112
#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:129
-#: ../../mod/photos.php:971
+#: ../../mod/photos.php:975
msgid "Please wait"
msgstr "Attendere"
@@ -1726,14 +1725,14 @@ msgstr "Dove sei ora?"
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Scadenza il AAAA-MM-GG OO:MM"
-#: ../../include/conversation.php:1083 ../../include/ItemObject.php:556
+#: ../../include/conversation.php:1083 ../../include/ItemObject.php:557
#: ../../mod/webpages.php:122 ../../mod/editpost.php:132
#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:177
-#: ../../mod/editblock.php:151 ../../mod/photos.php:991
+#: ../../mod/editblock.php:151 ../../mod/photos.php:995
msgid "Preview"
msgstr "Anteprima"
-#: ../../include/conversation.php:1097 ../../mod/photos.php:970
+#: ../../include/conversation.php:1097 ../../mod/photos.php:974
msgid "Share"
msgstr "Condividi"
@@ -1847,7 +1846,7 @@ msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
msgid "Set expiration date"
msgstr "Data di scadenza"
-#: ../../include/conversation.php:1147 ../../include/ItemObject.php:559
+#: ../../include/conversation.php:1147 ../../include/ItemObject.php:560
#: ../../mod/editpost.php:140 ../../mod/mail.php:228 ../../mod/mail.php:341
msgid "Encrypt text"
msgstr "Crittografia del testo"
@@ -1856,10 +1855,10 @@ msgstr "Crittografia del testo"
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1150 ../../mod/settings.php:514
-#: ../../mod/settings.php:540 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/editpost.php:143 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/editpost.php:143
+#: ../../mod/settings.php:517 ../../mod/settings.php:543
+#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
msgid "Cancel"
msgstr "Annulla"
@@ -1952,7 +1951,7 @@ msgstr "Segnalibri salvati"
msgid "Manage Webpages"
msgstr "Gestisci le pagine web"
-#: ../../include/identity.php:29 ../../mod/item.php:1161
+#: ../../include/identity.php:29 ../../mod/item.php:1177
msgid "Unable to obtain identity information from database"
msgstr "Impossibile ottenere le informazioni di identificazione dal database"
@@ -2033,17 +2032,17 @@ msgid "Edit visibility"
msgstr "Cambia la visibilità"
#: ../../include/identity.php:681 ../../include/identity.php:908
-#: ../../mod/directory.php:158
+#: ../../mod/directory.php:159
msgid "Gender:"
msgstr "Sesso:"
#: ../../include/identity.php:682 ../../include/identity.php:928
-#: ../../mod/directory.php:160
+#: ../../mod/directory.php:161
msgid "Status:"
msgstr "Stato:"
#: ../../include/identity.php:683 ../../include/identity.php:939
-#: ../../mod/directory.php:162
+#: ../../mod/directory.php:163
msgid "Homepage:"
msgstr "Home page:"
@@ -2090,7 +2089,7 @@ msgstr "Eventi di questa settimana:"
msgid "Profile"
msgstr "Profilo"
-#: ../../include/identity.php:906 ../../mod/settings.php:920
+#: ../../include/identity.php:906 ../../mod/settings.php:924
msgid "Full Name:"
msgstr "Nome completo:"
@@ -2135,7 +2134,7 @@ msgstr "Orientamento politico:"
msgid "Religion:"
msgstr "Religione:"
-#: ../../include/identity.php:949 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:165
msgid "About:"
msgstr "Informazioni:"
@@ -2187,14 +2186,14 @@ msgstr "Lavoro:"
msgid "School/education:"
msgstr "Scuola:"
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:847
msgid "Private Message"
msgstr "Messaggio privato"
#: ../../include/ItemObject.php:96 ../../include/page_widgets.php:8
-#: ../../mod/thing.php:229 ../../mod/menu.php:59 ../../mod/webpages.php:118
-#: ../../mod/settings.php:575 ../../mod/editpost.php:103
-#: ../../mod/layouts.php:102 ../../mod/editlayout.php:106
+#: ../../mod/thing.php:235 ../../mod/menu.php:59 ../../mod/webpages.php:118
+#: ../../mod/editpost.php:103 ../../mod/layouts.php:102
+#: ../../mod/settings.php:578 ../../mod/editlayout.php:106
#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:144
#: ../../mod/editblock.php:120 ../../mod/filestorage.php:170
msgid "Edit"
@@ -2224,7 +2223,7 @@ msgstr "preferito"
msgid "add tag"
msgstr "Aggiungi tag"
-#: ../../include/ItemObject.php:184 ../../mod/photos.php:968
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:972
msgid "I like this (toggle)"
msgstr "Attiva/disattiva Mi piace"
@@ -2232,7 +2231,7 @@ msgstr "Attiva/disattiva Mi piace"
msgid "like"
msgstr "mi piace"
-#: ../../include/ItemObject.php:185 ../../mod/photos.php:969
+#: ../../include/ItemObject.php:185 ../../mod/photos.php:973
msgid "I don't like this (toggle)"
msgstr "Attiva/disattiva Non mi piace"
@@ -2269,37 +2268,37 @@ msgstr "Da bacheca a bacheca"
msgid "via Wall-To-Wall:"
msgstr "da bacheca a bacheca:"
-#: ../../include/ItemObject.php:249
+#: ../../include/ItemObject.php:250
msgid "Bookmark Links"
-msgstr "I segnalibri dei link"
+msgstr "I link dei segnalibri"
-#: ../../include/ItemObject.php:279
+#: ../../include/ItemObject.php:280
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] "%d commento"
msgstr[1] "%d commenti"
-#: ../../include/ItemObject.php:544 ../../mod/photos.php:987
-#: ../../mod/photos.php:1074
+#: ../../include/ItemObject.php:545 ../../mod/photos.php:991
+#: ../../mod/photos.php:1078
msgid "This is you"
msgstr "Questo sei tu"
-#: ../../include/ItemObject.php:547 ../../mod/events.php:469
-#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
-#: ../../mod/settings.php:513 ../../mod/settings.php:625
-#: ../../mod/settings.php:653 ../../mod/settings.php:677
-#: ../../mod/settings.php:748 ../../mod/settings.php:912
-#: ../../mod/chat.php:119 ../../mod/chat.php:149 ../../mod/connect.php:92
+#: ../../include/ItemObject.php:548 ../../mod/events.php:469
+#: ../../mod/thing.php:283 ../../mod/thing.php:326 ../../mod/invite.php:156
+#: ../../mod/chat.php:162 ../../mod/chat.php:192 ../../mod/connect.php:92
#: ../../mod/group.php:81 ../../mod/admin.php:431 ../../mod/admin.php:738
#: ../../mod/admin.php:878 ../../mod/admin.php:1077 ../../mod/admin.php:1164
#: ../../mod/connedit.php:437 ../../mod/profiles.php:506
#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/setup.php:304
-#: ../../mod/setup.php:347 ../../mod/import.php:387 ../../mod/mail.php:223
+#: ../../mod/setup.php:347 ../../mod/settings.php:516
+#: ../../mod/settings.php:628 ../../mod/settings.php:656
+#: ../../mod/settings.php:680 ../../mod/settings.php:752
+#: ../../mod/settings.php:916 ../../mod/import.php:387 ../../mod/mail.php:223
#: ../../mod/mail.php:335 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
-#: ../../mod/filestorage.php:131 ../../mod/photos.php:562
-#: ../../mod/photos.php:667 ../../mod/photos.php:950 ../../mod/photos.php:990
-#: ../../mod/photos.php:1077 ../../mod/mood.php:142
+#: ../../mod/filestorage.php:131 ../../mod/photos.php:566
+#: ../../mod/photos.php:671 ../../mod/photos.php:954 ../../mod/photos.php:994
+#: ../../mod/photos.php:1081 ../../mod/mood.php:142
#: ../../view/theme/redbasic/php/config.php:95
#: ../../view/theme/apw/php/config.php:231
#: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2307,35 +2306,35 @@ msgstr "Questo sei tu"
msgid "Submit"
msgstr "Salva"
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:549
msgid "Bold"
msgstr "Grassetto"
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:550
msgid "Italic"
msgstr "Corsivo"
-#: ../../include/ItemObject.php:550
+#: ../../include/ItemObject.php:551
msgid "Underline"
msgstr "Sottolineato"
-#: ../../include/ItemObject.php:551
+#: ../../include/ItemObject.php:552
msgid "Quote"
msgstr "Citazione"
-#: ../../include/ItemObject.php:552
+#: ../../include/ItemObject.php:553
msgid "Code"
msgstr "Codice"
-#: ../../include/ItemObject.php:553
+#: ../../include/ItemObject.php:554
msgid "Image"
msgstr "Immagine"
-#: ../../include/ItemObject.php:554
+#: ../../include/ItemObject.php:555
msgid "Link"
msgstr "Link"
-#: ../../include/ItemObject.php:555
+#: ../../include/ItemObject.php:556
msgid "Video"
msgstr "Video"
@@ -2940,12 +2939,12 @@ msgstr "Impossibile elaborare l'immagine"
msgid "Photo storage failed."
msgstr "Impossibile caricare la foto."
-#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1187
+#: ../../include/photos.php:306 ../../mod/photos.php:694
+#: ../../mod/photos.php:1191
msgid "Upload New Photos"
msgstr "Carica nuove foto"
-#: ../../include/reddav.php:1018
+#: ../../include/reddav.php:1061
msgid "Edit File properties"
msgstr "Modifica le proprietà dei file"
@@ -2972,8 +2971,8 @@ msgstr "Entra in contatto"
msgid "Examples: Robert Morgenstein, Fishing"
msgstr "Per esempio: Mario Rossi, Pesca"
-#: ../../include/contact_widgets.php:24 ../../mod/directory.php:206
-#: ../../mod/directory.php:211 ../../mod/connections.php:357
+#: ../../include/contact_widgets.php:24 ../../mod/directory.php:207
+#: ../../mod/directory.php:212 ../../mod/connections.php:357
msgid "Find"
msgstr "Cerca"
@@ -3133,7 +3132,7 @@ msgstr "Piuttosto avanzato - molto utile nelle comunità aperte"
#: ../../include/permissions.php:32
msgid "Can send me bookmarks"
-msgstr "Può inviarmi segnalibri"
+msgstr "Può inviarmi dei segnalibri"
#: ../../include/permissions.php:33
msgid "Can administer my channel resources"
@@ -3144,48 +3143,48 @@ msgid ""
"Extremely advanced. Leave this alone unless you know what you are doing"
msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"
-#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:350
+#: ../../include/items.php:231 ../../mod/like.php:55 ../../mod/profperm.php:23
+#: ../../mod/group.php:68 ../../index.php:350
msgid "Permission denied"
msgstr "Permesso negato"
-#: ../../include/items.php:3430 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../include/items.php:3453 ../../mod/thing.php:78 ../../mod/admin.php:151
#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
#: ../../mod/home.php:63 ../../mod/display.php:32 ../../mod/filestorage.php:18
msgid "Item not found."
msgstr "Elemento non trovato."
-#: ../../include/items.php:3786 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3809 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr "Insieme non trovato."
-#: ../../include/items.php:3801
+#: ../../include/items.php:3824
msgid "Collection is empty."
msgstr "L'insieme di canali è vuoto."
-#: ../../include/items.php:3808
+#: ../../include/items.php:3831
#, php-format
msgid "Collection: %s"
msgstr "Insieme: %s"
-#: ../../include/items.php:3819
+#: ../../include/items.php:3842
#, php-format
msgid "Connection: %s"
msgstr "Contatto: %s"
-#: ../../include/items.php:3822
+#: ../../include/items.php:3845
msgid "Connection not found."
msgstr "Contatto non trovato."
-#: ../../include/zot.php:545
+#: ../../include/zot.php:548
msgid "Invalid data packet"
msgstr "Dati non validi"
-#: ../../include/zot.php:555
+#: ../../include/zot.php:558
msgid "Unable to verify channel signature"
msgstr "Impossibile verificare la firma elettronica del canale"
-#: ../../include/zot.php:732
+#: ../../include/zot.php:735
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Impossibile verificare la firma elettronica del sito %s"
@@ -3271,56 +3270,64 @@ msgstr "Titolo:"
msgid "Share this event"
msgstr "Condividi questo evento"
-#: ../../mod/thing.php:94
+#: ../../mod/thing.php:98
msgid "Thing updated"
msgstr "L'oggetto è stato aggiornato"
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:158
msgid "Object store: failed"
msgstr "Impossibile memorizzare l'oggetto."
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:162
msgid "Thing added"
msgstr "L'oggetto è stato aggiunto"
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:182
#, php-format
msgid "OBJ: %1$s %2$s %3$s"
msgstr "OBJ: %1$s %2$s %3$s"
-#: ../../mod/thing.php:228
+#: ../../mod/thing.php:234
msgid "Show Thing"
msgstr "Mostra l'oggetto"
-#: ../../mod/thing.php:235
+#: ../../mod/thing.php:241
msgid "item not found."
msgstr "non trovato."
-#: ../../mod/thing.php:263
+#: ../../mod/thing.php:269
msgid "Edit Thing"
msgstr "Modifica l'oggetto"
-#: ../../mod/thing.php:265 ../../mod/thing.php:311
+#: ../../mod/thing.php:271 ../../mod/thing.php:318
msgid "Select a profile"
msgstr "Scegli un profilo"
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:273 ../../mod/thing.php:320
msgid "Select a category of stuff. e.g. I ______ something"
msgstr "Scegli come riferirsi all'oggetto. Esempio: Io _____ l'oggetto"
-#: ../../mod/thing.php:270 ../../mod/thing.php:315
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Post an activity"
+msgstr "Pubblica un'attività"
+
+#: ../../mod/thing.php:275 ../../mod/thing.php:321
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Invia solo a chi segue il relativo canale"
+
+#: ../../mod/thing.php:277 ../../mod/thing.php:323
msgid "Name of thing e.g. something"
msgstr "Nome dell'oggetto"
-#: ../../mod/thing.php:272 ../../mod/thing.php:316
+#: ../../mod/thing.php:279 ../../mod/thing.php:324
msgid "URL of thing (optional)"
msgstr "Indirizzo web dell'oggetto"
-#: ../../mod/thing.php:274 ../../mod/thing.php:317
+#: ../../mod/thing.php:281 ../../mod/thing.php:325
msgid "URL for photo of thing (optional)"
msgstr "Indirizzo di un'immagine dell'oggetto (facoltativo)"
-#: ../../mod/thing.php:309
+#: ../../mod/thing.php:316
msgid "Add Thing to your Profile"
msgstr "Aggiungi l'oggetto al tuo profilo"
@@ -3413,20 +3420,20 @@ msgstr "L'articolo vuoto è stato ignorato."
msgid "Executable content type not permitted to this channel."
msgstr "I contenuti eseguibili non sono permessi su questo canale."
-#: ../../mod/item.php:819
+#: ../../mod/item.php:835
msgid "System error. Post not saved."
msgstr "Errore di sistema. Articolo non salvato."
-#: ../../mod/item.php:1086 ../../mod/wall_upload.php:41
+#: ../../mod/item.php:1102 ../../mod/wall_upload.php:41
msgid "Wall Photos"
msgstr "Foto della bacheca"
-#: ../../mod/item.php:1166
+#: ../../mod/item.php:1182
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale."
-#: ../../mod/item.php:1172
+#: ../../mod/item.php:1188
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
@@ -3493,11 +3500,11 @@ msgstr "Titolo del menù come comparirà a tutti"
#: ../../mod/menu.php:83 ../../mod/menu.php:112
msgid "Allow bookmarks"
-msgstr "Permetti di inviare segnalibri"
+msgstr "Permetti l'invio di segnalibri"
#: ../../mod/menu.php:83 ../../mod/menu.php:112
msgid "Menu may be used to store saved bookmarks"
-msgstr "I segnalibri possono essere salvati nel menu"
+msgstr "Puoi salvare i segnalibri nei menu"
#: ../../mod/menu.php:84 ../../mod/mitem.php:142 ../../mod/new_channel.php:117
msgid "Create"
@@ -3555,13 +3562,13 @@ msgid ""
" and/or create new posts for you?"
msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
-#: ../../mod/api.php:105 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:483
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
msgid "Yes"
msgstr "Si"
-#: ../../mod/api.php:106 ../../mod/settings.php:874 ../../mod/settings.php:879
-#: ../../mod/profiles.php:484
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:878
+#: ../../mod/settings.php:883
msgid "No"
msgstr "No"
@@ -3593,402 +3600,6 @@ msgstr "I miei segnalibri"
msgid "My Connections Bookmarks"
msgstr "I segnalibri dei miei contatti"
-#: ../../mod/settings.php:71
-msgid "Name is required"
-msgstr "Il nome è obbligatorio"
-
-#: ../../mod/settings.php:75
-msgid "Key and Secret are required"
-msgstr "Chiave e Segreto sono richiesti"
-
-#: ../../mod/settings.php:79 ../../mod/settings.php:539
-msgid "Update"
-msgstr "Aggiorna"
-
-#: ../../mod/settings.php:192
-msgid "Passwords do not match. Password unchanged."
-msgstr "Le password non corrispondono. Password non cambiata."
-
-#: ../../mod/settings.php:196
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Le password non possono essere vuote. Password non cambiata."
-
-#: ../../mod/settings.php:209
-msgid "Password changed."
-msgstr "Password cambiata."
-
-#: ../../mod/settings.php:211
-msgid "Password update failed. Please try again."
-msgstr "Aggiornamento password fallito. Prova ancora."
-
-#: ../../mod/settings.php:225
-msgid "Not valid email."
-msgstr "Email non valida."
-
-#: ../../mod/settings.php:228
-msgid "Protected email address. Cannot change to that email."
-msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
-
-#: ../../mod/settings.php:237
-msgid "System failure storing new email. Please try again."
-msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
-
-#: ../../mod/settings.php:441
-msgid "Settings updated."
-msgstr "Impostazioni aggiornate."
-
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
-#: ../../mod/settings.php:574
-msgid "Add application"
-msgstr "Aggiungi una app"
-
-#: ../../mod/settings.php:515 ../../mod/settings.php:541
-msgid "Name"
-msgstr "Nome"
-
-#: ../../mod/settings.php:515
-msgid "Name of application"
-msgstr "Nome dell'applicazione"
-
-#: ../../mod/settings.php:516 ../../mod/settings.php:542
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: ../../mod/settings.php:516 ../../mod/settings.php:517
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
-
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: ../../mod/settings.php:518 ../../mod/settings.php:544
-msgid "Redirect"
-msgstr "Redirect"
-
-#: ../../mod/settings.php:518
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
-
-#: ../../mod/settings.php:519 ../../mod/settings.php:545
-msgid "Icon url"
-msgstr "Url icona"
-
-#: ../../mod/settings.php:519
-msgid "Optional"
-msgstr "Opzionale"
-
-#: ../../mod/settings.php:530
-msgid "You can't edit this application."
-msgstr "Non puoi modificare questa applicazione."
-
-#: ../../mod/settings.php:573
-msgid "Connected Apps"
-msgstr "App connesse"
-
-#: ../../mod/settings.php:577
-msgid "Client key starts with"
-msgstr "La client key inizia con"
-
-#: ../../mod/settings.php:578
-msgid "No name"
-msgstr "Nessun nome"
-
-#: ../../mod/settings.php:579
-msgid "Remove authorization"
-msgstr "Revoca l'autorizzazione"
-
-#: ../../mod/settings.php:590
-msgid "No feature settings configured"
-msgstr "Non ci sono funzionalità aggiuntive personalizzabili"
-
-#: ../../mod/settings.php:598
-msgid "Feature Settings"
-msgstr "Impostazioni aggiuntive"
-
-#: ../../mod/settings.php:621
-msgid "Account Settings"
-msgstr "Impostazioni account"
-
-#: ../../mod/settings.php:622
-msgid "Password Settings"
-msgstr "Impostazioni password"
-
-#: ../../mod/settings.php:623
-msgid "New Password:"
-msgstr "Nuova password:"
-
-#: ../../mod/settings.php:624
-msgid "Confirm:"
-msgstr "Conferma:"
-
-#: ../../mod/settings.php:624
-msgid "Leave password fields blank unless changing"
-msgstr "Lascia questi campi in bianco per non cambiare la password"
-
-#: ../../mod/settings.php:626 ../../mod/settings.php:921
-msgid "Email Address:"
-msgstr "Indirizzo email:"
-
-#: ../../mod/settings.php:627
-msgid "Remove Account"
-msgstr "Elimina l'account"
-
-#: ../../mod/settings.php:628
-msgid "Warning: This action is permanent and cannot be reversed."
-msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata."
-
-#: ../../mod/settings.php:644
-msgid "Off"
-msgstr "Off"
-
-#: ../../mod/settings.php:644
-msgid "On"
-msgstr "On"
-
-#: ../../mod/settings.php:651
-msgid "Additional Features"
-msgstr "Funzionalità aggiuntive"
-
-#: ../../mod/settings.php:676
-msgid "Connector Settings"
-msgstr "Impostazioni del connettore"
-
-#: ../../mod/settings.php:706 ../../mod/admin.php:379
-msgid "No special theme for mobile devices"
-msgstr "Nessun tema per dispositivi mobili"
-
-#: ../../mod/settings.php:746
-msgid "Display Settings"
-msgstr "Impostazioni grafiche"
-
-#: ../../mod/settings.php:752
-msgid "Display Theme:"
-msgstr "Tema per monitor:"
-
-#: ../../mod/settings.php:753
-msgid "Mobile Theme:"
-msgstr "Tema per dispositivi mobili:"
-
-#: ../../mod/settings.php:754
-msgid "Update browser every xx seconds"
-msgstr "Aggiorna il browser ogni x secondi"
-
-#: ../../mod/settings.php:754
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimo 10 secondi, nessun limite massimo"
-
-#: ../../mod/settings.php:755
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
-
-#: ../../mod/settings.php:755
-msgid "Maximum of 100 items"
-msgstr "Massimo 100"
-
-#: ../../mod/settings.php:756
-msgid "Don't show emoticons"
-msgstr "Non mostrare le emoticons"
-
-#: ../../mod/settings.php:792
-msgid "Nobody except yourself"
-msgstr "Nessuno tranne te"
-
-#: ../../mod/settings.php:793
-msgid "Only those you specifically allow"
-msgstr "Solo chi riceve il mio permesso"
-
-#: ../../mod/settings.php:794
-msgid "Anybody in your address book"
-msgstr "Chiunque tra i miei contatti"
-
-#: ../../mod/settings.php:795
-msgid "Anybody on this website"
-msgstr "Chiunque su questo sito"
-
-#: ../../mod/settings.php:796
-msgid "Anybody in this network"
-msgstr "Chiunque su Red"
-
-#: ../../mod/settings.php:797
-msgid "Anybody on the internet"
-msgstr "Chiunque su internet"
-
-#: ../../mod/settings.php:874
-msgid "Publish your default profile in the network directory"
-msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali"
-
-#: ../../mod/settings.php:879
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?"
-
-#: ../../mod/settings.php:883 ../../mod/profile_photo.php:288
-msgid "or"
-msgstr "o"
-
-#: ../../mod/settings.php:888
-msgid "Your channel address is"
-msgstr "L'indirizzo del tuo canale è"
-
-#: ../../mod/settings.php:910
-msgid "Channel Settings"
-msgstr "Impostazioni del canale"
-
-#: ../../mod/settings.php:919
-msgid "Basic Settings"
-msgstr "Impostazioni di base"
-
-#: ../../mod/settings.php:922
-msgid "Your Timezone:"
-msgstr "Il tuo fuso orario:"
-
-#: ../../mod/settings.php:923
-msgid "Default Post Location:"
-msgstr "Località predefinita:"
-
-#: ../../mod/settings.php:924
-msgid "Use Browser Location:"
-msgstr "Usa la località rilevata dal browser:"
-
-#: ../../mod/settings.php:926
-msgid "Adult Content"
-msgstr "Contenuto per adulti"
-
-#: ../../mod/settings.php:926
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Questo canale pubblica frequentemente contenuto per adulti. (Il contenuto per adulti deve essere marcato con il tag #NSFW - Not Safe For Work)"
-
-#: ../../mod/settings.php:928
-msgid "Security and Privacy Settings"
-msgstr "Impostazioni di sicurezza e privacy"
-
-#: ../../mod/settings.php:930
-msgid "Hide my online presence"
-msgstr "Non mostrare la mia presenza online"
-
-#: ../../mod/settings.php:930
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Impedisce di mostrare ai tuoi contatti che sei online"
-
-#: ../../mod/settings.php:932
-msgid "Simple Privacy Settings:"
-msgstr "Impostazioni di privacy semplificate"
-
-#: ../../mod/settings.php:933
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>"
-
-#: ../../mod/settings.php:934
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Standard - <em>contenuti normalmente pubblici, oppure privati a scelta (simile ai social network ma con privacy migliorata)</em>"
-
-#: ../../mod/settings.php:935
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>"
-
-#: ../../mod/settings.php:936
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Bloccato - <em>chiuso in ricezione e invio</em>"
-
-#: ../../mod/settings.php:939
-msgid "Advanced Privacy Settings"
-msgstr "Impostazioni di privacy avanzate"
-
-#: ../../mod/settings.php:941
-msgid "Maximum Friend Requests/Day:"
-msgstr "Numero massimo giornaliero di richieste di amicizia:"
-
-#: ../../mod/settings.php:941
-msgid "May reduce spam activity"
-msgstr "Serve e ridurre lo spam"
-
-#: ../../mod/settings.php:942
-msgid "Default Post Permissions"
-msgstr "Permessi predefiniti per gli articoli"
-
-#: ../../mod/settings.php:943 ../../mod/mitem.php:134 ../../mod/mitem.php:177
-msgid "(click to open/close)"
-msgstr "(clicca per aprire/chiudere)"
-
-#: ../../mod/settings.php:954
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
-
-#: ../../mod/settings.php:954
-msgid "Useful to reduce spamming"
-msgstr "Serve e ridurre lo spam"
-
-#: ../../mod/settings.php:957
-msgid "Notification Settings"
-msgstr "Impostazioni di notifica"
-
-#: ../../mod/settings.php:958
-msgid "By default post a status message when:"
-msgstr "Pubblica un messaggio di stato quando:"
-
-#: ../../mod/settings.php:959
-msgid "accepting a friend request"
-msgstr "accetto una nuova amicizia"
-
-#: ../../mod/settings.php:960
-msgid "joining a forum/community"
-msgstr "entro a far parte di un forum"
-
-#: ../../mod/settings.php:961
-msgid "making an <em>interesting</em> profile change"
-msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
-
-#: ../../mod/settings.php:962
-msgid "Send a notification email when:"
-msgstr "Invia una email di notifica quando:"
-
-#: ../../mod/settings.php:963
-msgid "You receive an introduction"
-msgstr "Ricevi una richiesta di amicizia"
-
-#: ../../mod/settings.php:964
-msgid "Your introductions are confirmed"
-msgstr "Le tue richieste di amicizia sono state accettate"
-
-#: ../../mod/settings.php:965
-msgid "Someone writes on your profile wall"
-msgstr "Qualcuno scrive sulla tua bacheca"
-
-#: ../../mod/settings.php:966
-msgid "Someone writes a followup comment"
-msgstr "Qualcuno scrive un commento a un tuo articolo"
-
-#: ../../mod/settings.php:967
-msgid "You receive a private message"
-msgstr "Ricevi un messaggio privato"
-
-#: ../../mod/settings.php:968
-msgid "You receive a friend suggestion"
-msgstr "Ti viene suggerito un amico"
-
-#: ../../mod/settings.php:969
-msgid "You are tagged in a post"
-msgstr "Sei taggato in un articolo"
-
-#: ../../mod/settings.php:970
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Ricevi un poke in un articolo"
-
-#: ../../mod/settings.php:973
-msgid "Advanced Account/Page Type Settings"
-msgstr "Impostazioni avanzate"
-
-#: ../../mod/settings.php:974
-msgid "Change the behaviour of this account for special situations"
-msgstr "Cambia il funzionamento di questo account in situazioni particolari"
-
#: ../../mod/subthread.php:105
#, php-format
msgid "%1$s is following %2$s's %3$s"
@@ -4018,27 +3629,27 @@ msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
msgid "You must be logged in to see this page."
msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
-#: ../../mod/chat.php:120
+#: ../../mod/chat.php:163
msgid "Leave Room"
msgstr "Lascia la chat"
-#: ../../mod/chat.php:121
+#: ../../mod/chat.php:164
msgid "I am away right now"
msgstr "Non sono presente al momento"
-#: ../../mod/chat.php:122
+#: ../../mod/chat.php:165
msgid "I am online"
msgstr "Sono online"
-#: ../../mod/chat.php:146 ../../mod/chat.php:166
+#: ../../mod/chat.php:189 ../../mod/chat.php:209
msgid "New Chatroom"
msgstr "Nuova chat"
-#: ../../mod/chat.php:147
+#: ../../mod/chat.php:190
msgid "Chatroom Name"
msgstr "Nome della chat"
-#: ../../mod/chat.php:162
+#: ../../mod/chat.php:205
#, php-format
msgid "%1$s's Chatrooms"
msgstr "Le chat di %1$s"
@@ -4046,7 +3657,7 @@ msgstr "Le chat di %1$s"
#: ../../mod/viewconnections.php:17 ../../mod/search.php:13
#: ../../mod/directory.php:15 ../../mod/display.php:9
#: ../../mod/community.php:18 ../../mod/dirprofile.php:9
-#: ../../mod/photos.php:442
+#: ../../mod/photos.php:443
msgid "Public access denied."
msgstr "Accesso pubblico negato."
@@ -4075,7 +3686,7 @@ msgstr "Rimuovi il tag"
msgid "Select a tag to remove: "
msgstr "Seleziona un tag da rimuovere: "
-#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:905
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 ../../mod/photos.php:909
msgid "Remove"
msgstr "Rimuovi"
@@ -4229,6 +3840,10 @@ msgstr "Nuovo elemento del menù"
msgid "Menu Item Permissions"
msgstr "Permessi del menu"
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:947
+msgid "(click to open/close)"
+msgstr "(clicca per aprire/chiudere)"
+
#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
msgid "Link text"
msgstr "Testo del link"
@@ -4269,6 +3884,26 @@ msgstr "L'elemento del menù non può essere eliminato."
msgid "Edit Menu Element"
msgstr "Modifica l'elemento del menù"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Indentificativo del profilo non valido."
+
+#: ../../mod/profperm.php:105
+msgid "Profile Visibility Editor"
+msgstr "Modifica la visibilità del profilo"
+
+#: ../../mod/profperm.php:109
+msgid "Click on a contact to add or remove."
+msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
+
+#: ../../mod/profperm.php:118
+msgid "Visible To"
+msgstr "Visibile a"
+
+#: ../../mod/profperm.php:134 ../../mod/connections.php:250
+msgid "All Connections"
+msgstr "Tutti i contatti"
+
#: ../../mod/group.php:20
msgid "Collection created."
msgstr "L'insieme di canali è stato creato."
@@ -4317,26 +3952,6 @@ msgstr "Tutti i canali connessi"
msgid "Click on a channel to add or remove."
msgstr "Clicca su un canale per aggiungerlo o rimuoverlo."
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Indentificativo del profilo non valido."
-
-#: ../../mod/profperm.php:105
-msgid "Profile Visibility Editor"
-msgstr "Modifica la visibilità del profilo"
-
-#: ../../mod/profperm.php:109
-msgid "Click on a contact to add or remove."
-msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
-
-#: ../../mod/profperm.php:118
-msgid "Visible To"
-msgstr "Visibile a"
-
-#: ../../mod/profperm.php:134 ../../mod/connections.php:250
-msgid "All Connections"
-msgstr "Tutti i contatti"
-
#: ../../mod/admin.php:48
msgid "Theme settings updated."
msgstr "Le impostazioni del tema sono state aggiornate."
@@ -4411,6 +4026,10 @@ msgstr "Plugin attivi"
msgid "Site settings updated."
msgstr "Impostazioni del sito aggiornate."
+#: ../../mod/admin.php:379 ../../mod/settings.php:709
+msgid "No special theme for mobile devices"
+msgstr "Nessun tema per dispositivi mobili"
+
#: ../../mod/admin.php:381
msgid "No special theme for accessibility"
msgstr "Nessun tema speciale per l'accessibilità"
@@ -4912,28 +4531,28 @@ msgstr "Inserisci video Vorbis [.ogg]"
msgid "Insert Vorbis [.ogg] audio"
msgstr "Inserisci audio Vorbis [.ogg]"
-#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/directory.php:144 ../../mod/profiles.php:561
#: ../../mod/dirprofile.php:98
msgid "Age: "
msgstr "Età:"
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
+#: ../../mod/directory.php:147 ../../mod/dirprofile.php:101
msgid "Gender: "
msgstr "Sesso:"
-#: ../../mod/directory.php:207
+#: ../../mod/directory.php:208
msgid "Finding:"
msgstr "Ricerca:"
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:216
msgid "next page"
msgstr "pagina succ."
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:216
msgid "previous page"
msgstr "pagina prec."
-#: ../../mod/directory.php:222
+#: ../../mod/directory.php:223
msgid "No entries (some entries may be hidden)."
msgstr "Nessun risultato (qualcosa potrebbe essere nascosto)."
@@ -5180,7 +4799,7 @@ msgid ""
"href=\"settings\">privacy settings</a>, which have higher priority than "
"individual settings. Changing those inherited settings on this page will "
"have no effect."
-msgstr "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Non avrà alcun effetto cambiarli su questa pagina."
+msgstr "I permessi nelle <a href=\"settings\">impostazioni di privacy</a> hanno priorità su quelli mostrati in questa pagina. Non avrà alcun effetto cambiarli qui, se sono indicati come derivati."
#: ../../mod/connedit.php:453
msgid "Advanced Permissions"
@@ -6017,37 +5636,56 @@ msgstr "App e componenti aggiuntivi instalati:"
msgid "No installed plugins/addons/apps"
msgstr "Nessuna app o componente aggiuntivo installato"
-#: ../../mod/siteinfo.php:109
+#: ../../mod/siteinfo.php:93
+msgid "Project Donations"
+msgstr "Donazioni al progetto"
+
+#: ../../mod/siteinfo.php:94
+msgid ""
+"<p>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</p>"
+msgstr "<p>Red Matrix è realizzato da volontari che impiegano il loro tempo libero nel progetto. Il tuo contributo ci aiuterà a rendere migliore il web. Scegli l'opzione seguente per fare un'offerta singola dell'importo che preferisci</p>"
+
+#: ../../mod/siteinfo.php:95
+msgid "<p>or</p>"
+msgstr "<p>oppure</p>"
+
+#: ../../mod/siteinfo.php:96
+msgid "Recurring Donation Options"
+msgstr "Opzioni per offerte periodiche"
+
+#: ../../mod/siteinfo.php:115
msgid "Red"
msgstr "Red"
-#: ../../mod/siteinfo.php:110
+#: ../../mod/siteinfo.php:116
msgid ""
"This is a hub of the Red Matrix - a global cooperative network of "
"decentralised privacy enhanced websites."
msgstr "Questo è un hub di Red Matrix - una rete cooperativa e decentralizzata di siti con elevato livello di privacy. "
-#: ../../mod/siteinfo.php:113
+#: ../../mod/siteinfo.php:119
msgid "Running at web location"
msgstr "In esecuzione sull'indirizzo web"
-#: ../../mod/siteinfo.php:114
+#: ../../mod/siteinfo.php:120
msgid ""
"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
"about the Red Matrix."
msgstr "Visita <a href=\"http://getzot.com\">GetZot.com</a> per scoprire il progetto Red Matrix."
-#: ../../mod/siteinfo.php:115
+#: ../../mod/siteinfo.php:121
msgid "Bug reports and issues: please visit"
msgstr "Per segnalare bug e problemi: visita"
-#: ../../mod/siteinfo.php:118
+#: ../../mod/siteinfo.php:124
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
"com"
msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com"
-#: ../../mod/siteinfo.php:120
+#: ../../mod/siteinfo.php:126
msgid "Site Administrators"
msgstr "Amministratori del sito"
@@ -6154,6 +5792,407 @@ msgstr "Indirizzo email"
msgid "Reset"
msgstr "Reimposta"
+#: ../../mod/settings.php:71
+msgid "Name is required"
+msgstr "Il nome è obbligatorio"
+
+#: ../../mod/settings.php:75
+msgid "Key and Secret are required"
+msgstr "Chiave e Segreto sono richiesti"
+
+#: ../../mod/settings.php:79 ../../mod/settings.php:542
+msgid "Update"
+msgstr "Aggiorna"
+
+#: ../../mod/settings.php:195
+msgid "Passwords do not match. Password unchanged."
+msgstr "Le password non corrispondono. Password non cambiata."
+
+#: ../../mod/settings.php:199
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Le password non possono essere vuote. Password non cambiata."
+
+#: ../../mod/settings.php:212
+msgid "Password changed."
+msgstr "Password cambiata."
+
+#: ../../mod/settings.php:214
+msgid "Password update failed. Please try again."
+msgstr "Aggiornamento password fallito. Prova ancora."
+
+#: ../../mod/settings.php:228
+msgid "Not valid email."
+msgstr "Email non valida."
+
+#: ../../mod/settings.php:231
+msgid "Protected email address. Cannot change to that email."
+msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
+
+#: ../../mod/settings.php:240
+msgid "System failure storing new email. Please try again."
+msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
+
+#: ../../mod/settings.php:444
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
+
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
+#: ../../mod/settings.php:577
+msgid "Add application"
+msgstr "Aggiungi una app"
+
+#: ../../mod/settings.php:518 ../../mod/settings.php:544
+msgid "Name"
+msgstr "Nome"
+
+#: ../../mod/settings.php:518
+msgid "Name of application"
+msgstr "Nome dell'applicazione"
+
+#: ../../mod/settings.php:519 ../../mod/settings.php:545
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:519 ../../mod/settings.php:520
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
+
+#: ../../mod/settings.php:520 ../../mod/settings.php:546
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:521 ../../mod/settings.php:547
+msgid "Redirect"
+msgstr "Redirect"
+
+#: ../../mod/settings.php:521
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
+
+#: ../../mod/settings.php:522 ../../mod/settings.php:548
+msgid "Icon url"
+msgstr "Url icona"
+
+#: ../../mod/settings.php:522
+msgid "Optional"
+msgstr "Opzionale"
+
+#: ../../mod/settings.php:533
+msgid "You can't edit this application."
+msgstr "Non puoi modificare questa applicazione."
+
+#: ../../mod/settings.php:576
+msgid "Connected Apps"
+msgstr "App connesse"
+
+#: ../../mod/settings.php:580
+msgid "Client key starts with"
+msgstr "La client key inizia con"
+
+#: ../../mod/settings.php:581
+msgid "No name"
+msgstr "Nessun nome"
+
+#: ../../mod/settings.php:582
+msgid "Remove authorization"
+msgstr "Revoca l'autorizzazione"
+
+#: ../../mod/settings.php:593
+msgid "No feature settings configured"
+msgstr "Non ci sono funzionalità aggiuntive personalizzabili"
+
+#: ../../mod/settings.php:601
+msgid "Feature Settings"
+msgstr "Impostazioni aggiuntive"
+
+#: ../../mod/settings.php:624
+msgid "Account Settings"
+msgstr "Impostazioni account"
+
+#: ../../mod/settings.php:625
+msgid "Password Settings"
+msgstr "Impostazioni password"
+
+#: ../../mod/settings.php:626
+msgid "New Password:"
+msgstr "Nuova password:"
+
+#: ../../mod/settings.php:627
+msgid "Confirm:"
+msgstr "Conferma:"
+
+#: ../../mod/settings.php:627
+msgid "Leave password fields blank unless changing"
+msgstr "Lascia questi campi in bianco per non cambiare la password"
+
+#: ../../mod/settings.php:629 ../../mod/settings.php:925
+msgid "Email Address:"
+msgstr "Indirizzo email:"
+
+#: ../../mod/settings.php:630
+msgid "Remove Account"
+msgstr "Elimina l'account"
+
+#: ../../mod/settings.php:631
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata."
+
+#: ../../mod/settings.php:647
+msgid "Off"
+msgstr "Off"
+
+#: ../../mod/settings.php:647
+msgid "On"
+msgstr "On"
+
+#: ../../mod/settings.php:654
+msgid "Additional Features"
+msgstr "Funzionalità aggiuntive"
+
+#: ../../mod/settings.php:679
+msgid "Connector Settings"
+msgstr "Impostazioni del connettore"
+
+#: ../../mod/settings.php:750
+msgid "Display Settings"
+msgstr "Impostazioni grafiche"
+
+#: ../../mod/settings.php:756
+msgid "Display Theme:"
+msgstr "Tema per monitor:"
+
+#: ../../mod/settings.php:757
+msgid "Mobile Theme:"
+msgstr "Tema per dispositivi mobili:"
+
+#: ../../mod/settings.php:758
+msgid "Update browser every xx seconds"
+msgstr "Aggiorna il browser ogni x secondi"
+
+#: ../../mod/settings.php:758
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimo 10 secondi, nessun limite massimo"
+
+#: ../../mod/settings.php:759
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
+
+#: ../../mod/settings.php:759
+msgid "Maximum of 100 items"
+msgstr "Massimo 100"
+
+#: ../../mod/settings.php:760
+msgid "Don't show emoticons"
+msgstr "Non mostrare le emoticons"
+
+#: ../../mod/settings.php:761
+msgid "View remote profiles as webpages"
+msgstr "Visualizza gli altri profili come normali pagine web"
+
+#: ../../mod/settings.php:761
+msgid "By default open in a sub-window of your own site"
+msgstr "Se non selezionato, i profili degli altri utenti sono mostrati dentro un riquadro nella pagina"
+
+#: ../../mod/settings.php:796
+msgid "Nobody except yourself"
+msgstr "Nessuno tranne te"
+
+#: ../../mod/settings.php:797
+msgid "Only those you specifically allow"
+msgstr "Solo chi riceve il mio permesso"
+
+#: ../../mod/settings.php:798
+msgid "Anybody in your address book"
+msgstr "Chiunque tra i miei contatti"
+
+#: ../../mod/settings.php:799
+msgid "Anybody on this website"
+msgstr "Chiunque su questo sito"
+
+#: ../../mod/settings.php:800
+msgid "Anybody in this network"
+msgstr "Chiunque su Red"
+
+#: ../../mod/settings.php:801
+msgid "Anybody on the internet"
+msgstr "Chiunque su internet"
+
+#: ../../mod/settings.php:878
+msgid "Publish your default profile in the network directory"
+msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali"
+
+#: ../../mod/settings.php:883
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?"
+
+#: ../../mod/settings.php:887 ../../mod/profile_photo.php:288
+msgid "or"
+msgstr "o"
+
+#: ../../mod/settings.php:892
+msgid "Your channel address is"
+msgstr "L'indirizzo del tuo canale è"
+
+#: ../../mod/settings.php:914
+msgid "Channel Settings"
+msgstr "Impostazioni del canale"
+
+#: ../../mod/settings.php:923
+msgid "Basic Settings"
+msgstr "Impostazioni di base"
+
+#: ../../mod/settings.php:926
+msgid "Your Timezone:"
+msgstr "Il tuo fuso orario:"
+
+#: ../../mod/settings.php:927
+msgid "Default Post Location:"
+msgstr "Località predefinita:"
+
+#: ../../mod/settings.php:928
+msgid "Use Browser Location:"
+msgstr "Usa la località rilevata dal browser:"
+
+#: ../../mod/settings.php:930
+msgid "Adult Content"
+msgstr "Contenuto per adulti"
+
+#: ../../mod/settings.php:930
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Questo canale pubblica frequentemente contenuto per adulti. (Il contenuto per adulti deve essere marcato con il tag #NSFW - Not Safe For Work)"
+
+#: ../../mod/settings.php:932
+msgid "Security and Privacy Settings"
+msgstr "Impostazioni di sicurezza e privacy"
+
+#: ../../mod/settings.php:934
+msgid "Hide my online presence"
+msgstr "Non mostrare la mia presenza online"
+
+#: ../../mod/settings.php:934
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Non mostra sul tuo profilo che sei online"
+
+#: ../../mod/settings.php:936
+msgid "Simple Privacy Settings:"
+msgstr "Impostazioni di privacy semplificate"
+
+#: ../../mod/settings.php:937
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>"
+
+#: ../../mod/settings.php:938
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Standard - <em>contenuti normalmente pubblici, ma anche privati se necessario (simile ai social network ma con privacy migliorata)</em>"
+
+#: ../../mod/settings.php:939
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>"
+
+#: ../../mod/settings.php:940
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Bloccato - <em>bloccato in ricezione e invio</em>"
+
+#: ../../mod/settings.php:943
+msgid "Advanced Privacy Settings"
+msgstr "Impostazioni di privacy avanzate"
+
+#: ../../mod/settings.php:945
+msgid "Maximum Friend Requests/Day:"
+msgstr "Numero massimo giornaliero di richieste di amicizia:"
+
+#: ../../mod/settings.php:945
+msgid "May reduce spam activity"
+msgstr "Serve e ridurre lo spam"
+
+#: ../../mod/settings.php:946
+msgid "Default Post Permissions"
+msgstr "Permessi predefiniti per gli articoli"
+
+#: ../../mod/settings.php:958
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
+
+#: ../../mod/settings.php:958
+msgid "Useful to reduce spamming"
+msgstr "Serve e ridurre lo spam"
+
+#: ../../mod/settings.php:961
+msgid "Notification Settings"
+msgstr "Impostazioni di notifica"
+
+#: ../../mod/settings.php:962
+msgid "By default post a status message when:"
+msgstr "Pubblica un messaggio di stato quando:"
+
+#: ../../mod/settings.php:963
+msgid "accepting a friend request"
+msgstr "accetto una nuova amicizia"
+
+#: ../../mod/settings.php:964
+msgid "joining a forum/community"
+msgstr "entro a far parte di un forum"
+
+#: ../../mod/settings.php:965
+msgid "making an <em>interesting</em> profile change"
+msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
+
+#: ../../mod/settings.php:966
+msgid "Send a notification email when:"
+msgstr "Invia una email di notifica quando:"
+
+#: ../../mod/settings.php:967
+msgid "You receive an introduction"
+msgstr "Ricevi una richiesta di amicizia"
+
+#: ../../mod/settings.php:968
+msgid "Your introductions are confirmed"
+msgstr "Le tue richieste di amicizia sono state accettate"
+
+#: ../../mod/settings.php:969
+msgid "Someone writes on your profile wall"
+msgstr "Qualcuno scrive sulla tua bacheca"
+
+#: ../../mod/settings.php:970
+msgid "Someone writes a followup comment"
+msgstr "Qualcuno scrive un commento a un tuo articolo"
+
+#: ../../mod/settings.php:971
+msgid "You receive a private message"
+msgstr "Ricevi un messaggio privato"
+
+#: ../../mod/settings.php:972
+msgid "You receive a friend suggestion"
+msgstr "Ti viene suggerito un amico"
+
+#: ../../mod/settings.php:973
+msgid "You are tagged in a post"
+msgstr "Sei taggato in un articolo"
+
+#: ../../mod/settings.php:974
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Ricevi un poke in un articolo"
+
+#: ../../mod/settings.php:977
+msgid "Advanced Account/Page Type Settings"
+msgstr "Impostazioni avanzate"
+
+#: ../../mod/settings.php:978
+msgid "Change the behaviour of this account for special situations"
+msgstr "Cambia il funzionamento di questo account in situazioni particolari"
+
+#: ../../mod/settings.php:981
+msgid ""
+"Please enable expert mode (in Settings > Additional features) to adjust!"
+msgstr "Abilita la modalità esperto per fare cambiamenti! (in Impostazioni > Funzionalità aggiuntive)"
+
#: ../../mod/import.php:36
msgid "Nothing to import."
msgstr "Non c'è niente da importare."
@@ -6668,8 +6707,8 @@ msgstr "File non trovato."
msgid "Edit file permissions"
msgstr "Modifica i permessi del file"
-#: ../../mod/filestorage.php:124 ../../mod/photos.php:603
-#: ../../mod/photos.php:946
+#: ../../mod/filestorage.php:124 ../../mod/photos.php:607
+#: ../../mod/photos.php:950
msgid "Permissions"
msgstr "Permessi"
@@ -6863,123 +6902,123 @@ msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
msgid "Album not found."
msgstr "Album non trovato."
-#: ../../mod/photos.php:119 ../../mod/photos.php:668
+#: ../../mod/photos.php:119 ../../mod/photos.php:672
msgid "Delete Album"
msgstr "Elimina album"
-#: ../../mod/photos.php:159 ../../mod/photos.php:951
+#: ../../mod/photos.php:159 ../../mod/photos.php:955
msgid "Delete Photo"
msgstr "Elimina foto"
-#: ../../mod/photos.php:452
+#: ../../mod/photos.php:453
msgid "No photos selected"
msgstr "Nessuna foto selezionata"
-#: ../../mod/photos.php:499
+#: ../../mod/photos.php:500
msgid "Access to this item is restricted."
msgstr "Questo elemento non è visibile a tutti."
-#: ../../mod/photos.php:573
+#: ../../mod/photos.php:577
#, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
msgstr "Hai usato %1$.2f Mb di %2$.2f Mb disponibili per le foto."
-#: ../../mod/photos.php:576
+#: ../../mod/photos.php:580
#, php-format
msgid "You have used %1$.2f Mbytes of photo storage."
msgstr "Hai usato %1$.2f Mb di spazio per le foto."
-#: ../../mod/photos.php:595
+#: ../../mod/photos.php:599
msgid "Upload Photos"
msgstr "Carica foto"
-#: ../../mod/photos.php:599 ../../mod/photos.php:663
+#: ../../mod/photos.php:603 ../../mod/photos.php:667
msgid "New album name: "
msgstr "Nome del nuovo album: "
-#: ../../mod/photos.php:600
+#: ../../mod/photos.php:604
msgid "or existing album name: "
msgstr "o nome di un album esistente: "
-#: ../../mod/photos.php:601
+#: ../../mod/photos.php:605
msgid "Do not show a status post for this upload"
msgstr "Non creare un messaggio di stato per questo caricamento"
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1123
-#: ../../mod/photos.php:1138
+#: ../../mod/photos.php:656 ../../mod/photos.php:678 ../../mod/photos.php:1127
+#: ../../mod/photos.php:1142
msgid "Contact Photos"
msgstr "Foto dei contatti"
-#: ../../mod/photos.php:678
+#: ../../mod/photos.php:682
msgid "Edit Album"
msgstr "Modifica album"
-#: ../../mod/photos.php:684
+#: ../../mod/photos.php:688
msgid "Show Newest First"
msgstr "Prima i più recenti"
-#: ../../mod/photos.php:686
+#: ../../mod/photos.php:690
msgid "Show Oldest First"
msgstr "Prima i più vecchi"
-#: ../../mod/photos.php:729 ../../mod/photos.php:1170
+#: ../../mod/photos.php:733 ../../mod/photos.php:1174
msgid "View Photo"
msgstr "Guarda la foto"
-#: ../../mod/photos.php:775
+#: ../../mod/photos.php:779
msgid "Permission denied. Access to this item may be restricted."
msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:781
msgid "Photo not available"
msgstr "Foto non disponibile"
-#: ../../mod/photos.php:837
+#: ../../mod/photos.php:841
msgid "Use as profile photo"
msgstr "Usa come foto del profilo"
-#: ../../mod/photos.php:861
+#: ../../mod/photos.php:865
msgid "View Full Size"
msgstr "Vedi nelle dimensioni originali"
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:939
msgid "Edit photo"
msgstr "Modifica la foto"
-#: ../../mod/photos.php:937
+#: ../../mod/photos.php:941
msgid "Rotate CW (right)"
msgstr "Ruota (senso orario)"
-#: ../../mod/photos.php:938
+#: ../../mod/photos.php:942
msgid "Rotate CCW (left)"
msgstr "Ruota (senso antiorario)"
-#: ../../mod/photos.php:940
+#: ../../mod/photos.php:944
msgid "New album name"
msgstr "Nuovo nome dell'album"
-#: ../../mod/photos.php:943
+#: ../../mod/photos.php:947
msgid "Caption"
msgstr "Titolo"
-#: ../../mod/photos.php:945
+#: ../../mod/photos.php:949
msgid "Add a Tag"
msgstr "Aggiungi tag"
-#: ../../mod/photos.php:948
+#: ../../mod/photos.php:952
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Per esempio: @luca, @Maria_Bianchi, @bob@example.com, #California, #camping"
-#: ../../mod/photos.php:1101
+#: ../../mod/photos.php:1105
msgid "In This Photo:"
msgstr "In questa foto:"
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1180
msgid "View Album"
msgstr "Guarda l'album"
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1189
msgid "Recent Photos"
msgstr "Foto recenti"
diff --git a/view/it/strings.php b/view/it/strings.php
index 020b35e29..060273ef2 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -4,6 +4,45 @@ function string_plural_select_it($n){
return ($n != 1);;
}
;
+$a->strings["Categories"] = "Categorie";
+$a->strings["Connect"] = "Entra in contatto";
+$a->strings["Ignore/Hide"] = "Ignora/nascondi";
+$a->strings["Suggestions"] = "Suggerimenti";
+$a->strings["See more..."] = "Altro...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
+$a->strings["Add New Connection"] = "Aggiungi un contatto";
+$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara";
+$a->strings["Notes"] = "Note";
+$a->strings["Save"] = "Salva";
+$a->strings["Remove term"] = "Rimuovi termine";
+$a->strings["Saved Searches"] = "Ricerche salvate";
+$a->strings["add"] = "aggiungi";
+$a->strings["Saved Folders"] = "Cartelle salvate";
+$a->strings["Everything"] = "Tutto";
+$a->strings["Archives"] = "Archivi";
+$a->strings["Refresh"] = "Aggiorna";
+$a->strings["Me"] = "Io";
+$a->strings["Best Friends"] = "Buoni amici";
+$a->strings["Friends"] = "Amici";
+$a->strings["Co-workers"] = "Colleghi";
+$a->strings["Former Friends"] = "Ex amici";
+$a->strings["Acquaintances"] = "Conoscenti";
+$a->strings["Everybody"] = "Tutti";
+$a->strings["Account settings"] = "Impostazioni dell'account";
+$a->strings["Channel settings"] = "Impostazioni del canale";
+$a->strings["Additional features"] = "Funzionalità aggiuntive";
+$a->strings["Feature settings"] = "Impostazioni aggiuntive";
+$a->strings["Display settings"] = "Impostazioni grafiche";
+$a->strings["Connected apps"] = "App connesse";
+$a->strings["Export channel"] = "Esporta il canale";
+$a->strings["Automatic Permissions (Advanced)"] = "Permessi predefiniti (avanzato)";
+$a->strings["Premium Channel Settings"] = "Canale premium - impostazioni";
+$a->strings["Channel Sources"] = "Sorgenti del canale";
+$a->strings["Settings"] = "Impostazioni";
+$a->strings["Check Mail"] = "Controlla i messaggi";
+$a->strings["New Message"] = "Nuovo messaggio";
+$a->strings["Chat Rooms"] = "Chat attive";
$a->strings["Visible to everybody"] = "Visibile a tutti";
$a->strings["show"] = "mostra";
$a->strings["don't show"] = "non mostrare";
@@ -31,7 +70,7 @@ $a->strings["Your events"] = "I tuoi eventi";
$a->strings["Bookmarks"] = "Segnalibri";
$a->strings["Your bookmarks"] = "I tuoi segnalibri";
$a->strings["Webpages"] = "Pagine web";
-$a->strings["Your webpages"] = "Le tue pagine";
+$a->strings["Your webpages"] = "Le tue pagine web";
$a->strings["Login"] = "Accedi";
$a->strings["Sign in"] = "Entra";
$a->strings["%s - click to logout"] = "%s - clicca per uscire";
@@ -65,13 +104,11 @@ $a->strings["See all private messages"] = "Guarda tutti i messaggi privati";
$a->strings["Mark all private messages seen"] = "Segna come letti tutti i messaggi privati";
$a->strings["Inbox"] = "In arrivo";
$a->strings["Outbox"] = "Inviati";
-$a->strings["New Message"] = "Nuovo messaggio";
$a->strings["Event Calendar"] = "Calendario";
$a->strings["See all events"] = "Guarda tutti gli eventi";
$a->strings["Mark all events seen"] = "Marca come letti tutti gli eventi";
$a->strings["Channel Select"] = "Gestisci i canali";
$a->strings["Manage Your Channels"] = "Gestisci i contatti dei tuoi canali";
-$a->strings["Settings"] = "Impostazioni";
$a->strings["Account/Channel Settings"] = "Impostazioni account e canali";
$a->strings["Connections"] = "Contatti";
$a->strings["Manage/Edit Friends and Connections"] = "Modifica amici e contatti";
@@ -91,7 +128,6 @@ $a->strings["%d Connection"] = array(
1 => "%d contatti",
);
$a->strings["View Connections"] = "Elenco contatti";
-$a->strings["Save"] = "Salva";
$a->strings["poke"] = "poke";
$a->strings["poked"] = "ha ricevuto un poke";
$a->strings["ping"] = "ping";
@@ -163,42 +199,12 @@ $a->strings["Blocks"] = "Riquadri";
$a->strings["Menus"] = "Menù";
$a->strings["Layouts"] = "Layout";
$a->strings["Pages"] = "Pagine";
-$a->strings["Categories"] = "Categorie";
-$a->strings["Connect"] = "Entra in contatto";
-$a->strings["Ignore/Hide"] = "Ignora/nascondi";
-$a->strings["Suggestions"] = "Suggerimenti";
-$a->strings["See more..."] = "Altro...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
-$a->strings["Add New Connection"] = "Aggiungi un contatto";
-$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara";
-$a->strings["Notes"] = "Note";
-$a->strings["Remove term"] = "Rimuovi termine";
-$a->strings["Saved Searches"] = "Ricerche salvate";
-$a->strings["add"] = "aggiungi";
-$a->strings["Saved Folders"] = "Cartelle salvate";
-$a->strings["Everything"] = "Tutto";
-$a->strings["Archives"] = "Archivi";
-$a->strings["Refresh"] = "Aggiorna";
-$a->strings["Me"] = "Io";
-$a->strings["Best Friends"] = "Buoni amici";
-$a->strings["Friends"] = "Amici";
-$a->strings["Co-workers"] = "Colleghi";
-$a->strings["Former Friends"] = "Ex amici";
-$a->strings["Acquaintances"] = "Conoscenti";
-$a->strings["Everybody"] = "Tutti";
-$a->strings["Account settings"] = "Impostazioni dell'account";
-$a->strings["Channel settings"] = "Impostazioni del canale";
-$a->strings["Additional features"] = "Funzionalità aggiuntive";
-$a->strings["Feature settings"] = "Impostazioni aggiuntive";
-$a->strings["Display settings"] = "Impostazioni grafiche";
-$a->strings["Connected apps"] = "App connesse";
-$a->strings["Export channel"] = "Esporta il canale";
-$a->strings["Automatic Permissions (Advanced)"] = "Permessi predefiniti (avanzato)";
-$a->strings["Premium Channel Settings"] = "Canale premium - impostazioni";
-$a->strings["Channel Sources"] = "Sorgenti del canale";
-$a->strings["Check Mail"] = "Controlla i messaggi";
-$a->strings["Chat Rooms"] = "Chat attive";
+$a->strings["Image/photo"] = "Immagine";
+$a->strings["Encrypted content"] = "Contenuto crittografato";
+$a->strings["QR code"] = "QR code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s";
+$a->strings["post"] = "l'articolo";
+$a->strings["$1 wrote:"] = "$1 ha scritto:";
$a->strings["New window"] = "Nuova finestra";
$a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
$a->strings["General Features"] = "Funzionalità generali";
@@ -351,12 +357,6 @@ $a->strings["duplicate filename or path"] = "il file o percorso del file è dupl
$a->strings["Path not found."] = "Percorso del file non trovato.";
$a->strings["mkdir failed."] = "mkdir fallito.";
$a->strings["database storage failed."] = "scrittura su database fallita.";
-$a->strings["Image/photo"] = "Immagine";
-$a->strings["Encrypted content"] = "Contenuto crittografato";
-$a->strings["QR code"] = "QR code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s";
-$a->strings["post"] = "l'articolo";
-$a->strings["$1 wrote:"] = "$1 ha scritto:";
$a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
$a->strings["channel"] = "canale";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
@@ -535,7 +535,7 @@ $a->strings["to"] = "a";
$a->strings["via"] = "via";
$a->strings["Wall-to-Wall"] = "Da bacheca a bacheca";
$a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:";
-$a->strings["Bookmark Links"] = "I segnalibri dei link";
+$a->strings["Bookmark Links"] = "I link dei segnalibri";
$a->strings["%d comment"] = array(
0 => "%d commento",
1 => "%d commenti",
@@ -741,7 +741,7 @@ $a->strings["Can write to my \"public\" file storage"] = "Può scrivere sul mio
$a->strings["Can edit my \"public\" pages"] = "Può modificare le mie pagine web \"pubbliche\"";
$a->strings["Can source my \"public\" posts in derived channels"] = "Può aggiungere i miei post \"pubblici\" a un suo canale derivato";
$a->strings["Somewhat advanced - very useful in open communities"] = "Piuttosto avanzato - molto utile nelle comunità aperte";
-$a->strings["Can send me bookmarks"] = "Può inviarmi segnalibri";
+$a->strings["Can send me bookmarks"] = "Può inviarmi dei segnalibri";
$a->strings["Can administer my channel resources"] = "Può amministrare i contenuti del mio canale";
$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri";
$a->strings["Permission denied"] = "Permesso negato";
@@ -783,6 +783,8 @@ $a->strings["item not found."] = "non trovato.";
$a->strings["Edit Thing"] = "Modifica l'oggetto";
$a->strings["Select a profile"] = "Scegli un profilo";
$a->strings["Select a category of stuff. e.g. I ______ something"] = "Scegli come riferirsi all'oggetto. Esempio: Io _____ l'oggetto";
+$a->strings["Post an activity"] = "Pubblica un'attività";
+$a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi segue il relativo canale";
$a->strings["Name of thing e.g. something"] = "Nome dell'oggetto";
$a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto";
$a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
@@ -828,8 +830,8 @@ $a->strings["Menu name"] = "Nome del menù";
$a->strings["Must be unique, only seen by you"] = "Deve essere unico, lo vedrai solo tu";
$a->strings["Menu title"] = "Titolo del menù";
$a->strings["Menu title as seen by others"] = "Titolo del menù come comparirà a tutti";
-$a->strings["Allow bookmarks"] = "Permetti di inviare segnalibri";
-$a->strings["Menu may be used to store saved bookmarks"] = "I segnalibri possono essere salvati nel menu";
+$a->strings["Allow bookmarks"] = "Permetti l'invio di segnalibri";
+$a->strings["Menu may be used to store saved bookmarks"] = "Puoi salvare i segnalibri nei menu";
$a->strings["Create"] = "Crea";
$a->strings["Menu not found."] = "Menù non trovato.";
$a->strings["Menu deleted."] = "Menù eliminato.";
@@ -852,103 +854,6 @@ $a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"
$a->strings["Bookmark added"] = "Segnalibro aggiunto";
$a->strings["My Bookmarks"] = "I miei segnalibri";
$a->strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti";
-$a->strings["Name is required"] = "Il nome è obbligatorio";
-$a->strings["Key and Secret are required"] = "Chiave e Segreto sono richiesti";
-$a->strings["Update"] = "Aggiorna";
-$a->strings["Passwords do not match. Password unchanged."] = "Le password non corrispondono. Password non cambiata.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Le password non possono essere vuote. Password non cambiata.";
-$a->strings["Password changed."] = "Password cambiata.";
-$a->strings["Password update failed. Please try again."] = "Aggiornamento password fallito. Prova ancora.";
-$a->strings["Not valid email."] = "Email non valida.";
-$a->strings["Protected email address. Cannot change to that email."] = "È un indirizzo email riservato. Non puoi sceglierlo.";
-$a->strings["System failure storing new email. Please try again."] = "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore.";
-$a->strings["Settings updated."] = "Impostazioni aggiornate.";
-$a->strings["Add application"] = "Aggiungi una app";
-$a->strings["Name"] = "Nome";
-$a->strings["Name of application"] = "Nome dell'applicazione";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Redirect";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione.";
-$a->strings["Icon url"] = "Url icona";
-$a->strings["Optional"] = "Opzionale";
-$a->strings["You can't edit this application."] = "Non puoi modificare questa applicazione.";
-$a->strings["Connected Apps"] = "App connesse";
-$a->strings["Client key starts with"] = "La client key inizia con";
-$a->strings["No name"] = "Nessun nome";
-$a->strings["Remove authorization"] = "Revoca l'autorizzazione";
-$a->strings["No feature settings configured"] = "Non ci sono funzionalità aggiuntive personalizzabili";
-$a->strings["Feature Settings"] = "Impostazioni aggiuntive";
-$a->strings["Account Settings"] = "Impostazioni account";
-$a->strings["Password Settings"] = "Impostazioni password";
-$a->strings["New Password:"] = "Nuova password:";
-$a->strings["Confirm:"] = "Conferma:";
-$a->strings["Leave password fields blank unless changing"] = "Lascia questi campi in bianco per non cambiare la password";
-$a->strings["Email Address:"] = "Indirizzo email:";
-$a->strings["Remove Account"] = "Elimina l'account";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "Attenzione: questa azione è permanente e non potrà più essere annullata.";
-$a->strings["Off"] = "Off";
-$a->strings["On"] = "On";
-$a->strings["Additional Features"] = "Funzionalità aggiuntive";
-$a->strings["Connector Settings"] = "Impostazioni del connettore";
-$a->strings["No special theme for mobile devices"] = "Nessun tema per dispositivi mobili";
-$a->strings["Display Settings"] = "Impostazioni grafiche";
-$a->strings["Display Theme:"] = "Tema per monitor:";
-$a->strings["Mobile Theme:"] = "Tema per dispositivi mobili:";
-$a->strings["Update browser every xx seconds"] = "Aggiorna il browser ogni x secondi";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimo 10 secondi, nessun limite massimo";
-$a->strings["Maximum number of conversations to load at any time:"] = "Massimo numero di conversazioni da mostrare ogni volta:";
-$a->strings["Maximum of 100 items"] = "Massimo 100";
-$a->strings["Don't show emoticons"] = "Non mostrare le emoticons";
-$a->strings["Nobody except yourself"] = "Nessuno tranne te";
-$a->strings["Only those you specifically allow"] = "Solo chi riceve il mio permesso";
-$a->strings["Anybody in your address book"] = "Chiunque tra i miei contatti";
-$a->strings["Anybody on this website"] = "Chiunque su questo sito";
-$a->strings["Anybody in this network"] = "Chiunque su Red";
-$a->strings["Anybody on the internet"] = "Chiunque su internet";
-$a->strings["Publish your default profile in the network directory"] = "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come potenziale amico ai nuovi membri?";
-$a->strings["or"] = "o";
-$a->strings["Your channel address is"] = "L'indirizzo del tuo canale è";
-$a->strings["Channel Settings"] = "Impostazioni del canale";
-$a->strings["Basic Settings"] = "Impostazioni di base";
-$a->strings["Your Timezone:"] = "Il tuo fuso orario:";
-$a->strings["Default Post Location:"] = "Località predefinita:";
-$a->strings["Use Browser Location:"] = "Usa la località rilevata dal browser:";
-$a->strings["Adult Content"] = "Contenuto per adulti";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Questo canale pubblica frequentemente contenuto per adulti. (Il contenuto per adulti deve essere marcato con il tag #NSFW - Not Safe For Work)";
-$a->strings["Security and Privacy Settings"] = "Impostazioni di sicurezza e privacy";
-$a->strings["Hide my online presence"] = "Non mostrare la mia presenza online";
-$a->strings["Prevents displaying in your profile that you are online"] = "Impedisce di mostrare ai tuoi contatti che sei online";
-$a->strings["Simple Privacy Settings:"] = "Impostazioni di privacy semplificate";
-$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>";
-$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Standard - <em>contenuti normalmente pubblici, oppure privati a scelta (simile ai social network ma con privacy migliorata)</em>";
-$a->strings["Private - <em>default private, never open or public</em>"] = "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>";
-$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloccato - <em>chiuso in ricezione e invio</em>";
-$a->strings["Advanced Privacy Settings"] = "Impostazioni di privacy avanzate";
-$a->strings["Maximum Friend Requests/Day:"] = "Numero massimo giornaliero di richieste di amicizia:";
-$a->strings["May reduce spam activity"] = "Serve e ridurre lo spam";
-$a->strings["Default Post Permissions"] = "Permessi predefiniti per gli articoli";
-$a->strings["(click to open/close)"] = "(clicca per aprire/chiudere)";
-$a->strings["Maximum private messages per day from unknown people:"] = "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:";
-$a->strings["Useful to reduce spamming"] = "Serve e ridurre lo spam";
-$a->strings["Notification Settings"] = "Impostazioni di notifica";
-$a->strings["By default post a status message when:"] = "Pubblica un messaggio di stato quando:";
-$a->strings["accepting a friend request"] = "accetto una nuova amicizia";
-$a->strings["joining a forum/community"] = "entro a far parte di un forum";
-$a->strings["making an <em>interesting</em> profile change"] = "faccio un cambiamento <em>interessante</em> al mio profilo";
-$a->strings["Send a notification email when:"] = "Invia una email di notifica quando:";
-$a->strings["You receive an introduction"] = "Ricevi una richiesta di amicizia";
-$a->strings["Your introductions are confirmed"] = "Le tue richieste di amicizia sono state accettate";
-$a->strings["Someone writes on your profile wall"] = "Qualcuno scrive sulla tua bacheca";
-$a->strings["Someone writes a followup comment"] = "Qualcuno scrive un commento a un tuo articolo";
-$a->strings["You receive a private message"] = "Ricevi un messaggio privato";
-$a->strings["You receive a friend suggestion"] = "Ti viene suggerito un amico";
-$a->strings["You are tagged in a post"] = "Sei taggato in un articolo";
-$a->strings["You are poked/prodded/etc. in a post"] = "Ricevi un poke in un articolo";
-$a->strings["Advanced Account/Page Type Settings"] = "Impostazioni avanzate";
-$a->strings["Change the behaviour of this account for special situations"] = "Cambia il funzionamento di questo account in situazioni particolari";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s sta seguendo %3\$s di %2\$s";
$a->strings["[Embedded content - reload page to view]"] = "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]";
$a->strings["Channel not found."] = "Canale non trovato.";
@@ -1004,6 +909,7 @@ $a->strings["Delete this menu item"] = "Elimina questo elemento del menù";
$a->strings["Edit this menu item"] = "Modifica questo elemento del menù";
$a->strings["New Menu Element"] = "Nuovo elemento del menù";
$a->strings["Menu Item Permissions"] = "Permessi del menu";
+$a->strings["(click to open/close)"] = "(clicca per aprire/chiudere)";
$a->strings["Link text"] = "Testo del link";
$a->strings["URL of link"] = "Indirizzo del link";
$a->strings["Use Red magic-auth if available"] = "Usa l'autenticazione magica di Red, se disponibile";
@@ -1014,6 +920,11 @@ $a->strings["Menu item not found."] = "L'elemento del menù non è stato trovato
$a->strings["Menu item deleted."] = "L'elemento del menù è stato eliminato.";
$a->strings["Menu item could not be deleted."] = "L'elemento del menù non può essere eliminato.";
$a->strings["Edit Menu Element"] = "Modifica l'elemento del menù";
+$a->strings["Invalid profile identifier."] = "Indentificativo del profilo non valido.";
+$a->strings["Profile Visibility Editor"] = "Modifica la visibilità del profilo";
+$a->strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
+$a->strings["Visible To"] = "Visibile a";
+$a->strings["All Connections"] = "Tutti i contatti";
$a->strings["Collection created."] = "L'insieme di canali è stato creato.";
$a->strings["Could not create collection."] = "Impossibile creare l'insieme.";
$a->strings["Collection updated."] = "Insieme aggiornato.";
@@ -1026,11 +937,6 @@ $a->strings["Collection Editor"] = "Modifica l'insieme";
$a->strings["Members"] = "Membri";
$a->strings["All Connected Channels"] = "Tutti i canali connessi";
$a->strings["Click on a channel to add or remove."] = "Clicca su un canale per aggiungerlo o rimuoverlo.";
-$a->strings["Invalid profile identifier."] = "Indentificativo del profilo non valido.";
-$a->strings["Profile Visibility Editor"] = "Modifica la visibilità del profilo";
-$a->strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
-$a->strings["Visible To"] = "Visibile a";
-$a->strings["All Connections"] = "Tutti i contatti";
$a->strings["Theme settings updated."] = "Le impostazioni del tema sono state aggiornate.";
$a->strings["Site"] = "Sito";
$a->strings["Users"] = "Utenti";
@@ -1049,6 +955,7 @@ $a->strings["Pending registrations"] = "Registrazioni da approvare";
$a->strings["Version"] = "Versione";
$a->strings["Active plugins"] = "Plugin attivi";
$a->strings["Site settings updated."] = "Impostazioni del sito aggiornate.";
+$a->strings["No special theme for mobile devices"] = "Nessun tema per dispositivi mobili";
$a->strings["No special theme for accessibility"] = "Nessun tema speciale per l'accessibilità";
$a->strings["Closed"] = "Chiusa";
$a->strings["Requires approval"] = "Richiede l'approvazione";
@@ -1229,7 +1136,7 @@ $a->strings["Full Sharing (typical social network permissions)"] = "Condivisione
$a->strings["Cautious Sharing "] = "Condivisione prudente";
$a->strings["Follow Only"] = "Follower";
$a->strings["Individual Permissions"] = "Permessi individuali";
-$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Alcuni permessi derivano dalle <a href=\"settings\">impostazioni di privacy</a>, che hanno una priorità maggiore. Non avrà alcun effetto cambiarli su questa pagina.";
+$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "I permessi nelle <a href=\"settings\">impostazioni di privacy</a> hanno priorità su quelli mostrati in questa pagina. Non avrà alcun effetto cambiarli qui, se sono indicati come derivati.";
$a->strings["Advanced Permissions"] = "Permessi avanzati";
$a->strings["Simple Permissions (select one and submit)"] = "Permessi semplificati (seleziona e salva)";
$a->strings["Visit %s's profile - %s"] = "Guarda il profilo di %s - %s";
@@ -1422,6 +1329,10 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
$a->strings["Version %s"] = "Versione %s";
$a->strings["Installed plugins/addons/apps:"] = "App e componenti aggiuntivi instalati:";
$a->strings["No installed plugins/addons/apps"] = "Nessuna app o componente aggiuntivo installato";
+$a->strings["Project Donations"] = "Donazioni al progetto";
+$a->strings["<p>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</p>"] = "<p>Red Matrix è realizzato da volontari che impiegano il loro tempo libero nel progetto. Il tuo contributo ci aiuterà a rendere migliore il web. Scegli l'opzione seguente per fare un'offerta singola dell'importo che preferisci</p>";
+$a->strings["<p>or</p>"] = "<p>oppure</p>";
+$a->strings["Recurring Donation Options"] = "Opzioni per offerte periodiche";
$a->strings["Red"] = "Red";
$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Questo è un hub di Red Matrix - una rete cooperativa e decentralizzata di siti con elevato livello di privacy. ";
$a->strings["Running at web location"] = "In esecuzione sull'indirizzo web";
@@ -1451,6 +1362,104 @@ $a->strings["Forgot your Password?"] = "Hai dimenticato la password?";
$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare.";
$a->strings["Email Address"] = "Indirizzo email";
$a->strings["Reset"] = "Reimposta";
+$a->strings["Name is required"] = "Il nome è obbligatorio";
+$a->strings["Key and Secret are required"] = "Chiave e Segreto sono richiesti";
+$a->strings["Update"] = "Aggiorna";
+$a->strings["Passwords do not match. Password unchanged."] = "Le password non corrispondono. Password non cambiata.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Le password non possono essere vuote. Password non cambiata.";
+$a->strings["Password changed."] = "Password cambiata.";
+$a->strings["Password update failed. Please try again."] = "Aggiornamento password fallito. Prova ancora.";
+$a->strings["Not valid email."] = "Email non valida.";
+$a->strings["Protected email address. Cannot change to that email."] = "È un indirizzo email riservato. Non puoi sceglierlo.";
+$a->strings["System failure storing new email. Please try again."] = "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore.";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
+$a->strings["Add application"] = "Aggiungi una app";
+$a->strings["Name"] = "Nome";
+$a->strings["Name of application"] = "Nome dell'applicazione";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Redirect";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione.";
+$a->strings["Icon url"] = "Url icona";
+$a->strings["Optional"] = "Opzionale";
+$a->strings["You can't edit this application."] = "Non puoi modificare questa applicazione.";
+$a->strings["Connected Apps"] = "App connesse";
+$a->strings["Client key starts with"] = "La client key inizia con";
+$a->strings["No name"] = "Nessun nome";
+$a->strings["Remove authorization"] = "Revoca l'autorizzazione";
+$a->strings["No feature settings configured"] = "Non ci sono funzionalità aggiuntive personalizzabili";
+$a->strings["Feature Settings"] = "Impostazioni aggiuntive";
+$a->strings["Account Settings"] = "Impostazioni account";
+$a->strings["Password Settings"] = "Impostazioni password";
+$a->strings["New Password:"] = "Nuova password:";
+$a->strings["Confirm:"] = "Conferma:";
+$a->strings["Leave password fields blank unless changing"] = "Lascia questi campi in bianco per non cambiare la password";
+$a->strings["Email Address:"] = "Indirizzo email:";
+$a->strings["Remove Account"] = "Elimina l'account";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Attenzione: questa azione è permanente e non potrà più essere annullata.";
+$a->strings["Off"] = "Off";
+$a->strings["On"] = "On";
+$a->strings["Additional Features"] = "Funzionalità aggiuntive";
+$a->strings["Connector Settings"] = "Impostazioni del connettore";
+$a->strings["Display Settings"] = "Impostazioni grafiche";
+$a->strings["Display Theme:"] = "Tema per monitor:";
+$a->strings["Mobile Theme:"] = "Tema per dispositivi mobili:";
+$a->strings["Update browser every xx seconds"] = "Aggiorna il browser ogni x secondi";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimo 10 secondi, nessun limite massimo";
+$a->strings["Maximum number of conversations to load at any time:"] = "Massimo numero di conversazioni da mostrare ogni volta:";
+$a->strings["Maximum of 100 items"] = "Massimo 100";
+$a->strings["Don't show emoticons"] = "Non mostrare le emoticons";
+$a->strings["View remote profiles as webpages"] = "Visualizza gli altri profili come normali pagine web";
+$a->strings["By default open in a sub-window of your own site"] = "Se non selezionato, i profili degli altri utenti sono mostrati dentro un riquadro nella pagina";
+$a->strings["Nobody except yourself"] = "Nessuno tranne te";
+$a->strings["Only those you specifically allow"] = "Solo chi riceve il mio permesso";
+$a->strings["Anybody in your address book"] = "Chiunque tra i miei contatti";
+$a->strings["Anybody on this website"] = "Chiunque su questo sito";
+$a->strings["Anybody in this network"] = "Chiunque su Red";
+$a->strings["Anybody on the internet"] = "Chiunque su internet";
+$a->strings["Publish your default profile in the network directory"] = "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come potenziale amico ai nuovi membri?";
+$a->strings["or"] = "o";
+$a->strings["Your channel address is"] = "L'indirizzo del tuo canale è";
+$a->strings["Channel Settings"] = "Impostazioni del canale";
+$a->strings["Basic Settings"] = "Impostazioni di base";
+$a->strings["Your Timezone:"] = "Il tuo fuso orario:";
+$a->strings["Default Post Location:"] = "Località predefinita:";
+$a->strings["Use Browser Location:"] = "Usa la località rilevata dal browser:";
+$a->strings["Adult Content"] = "Contenuto per adulti";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Questo canale pubblica frequentemente contenuto per adulti. (Il contenuto per adulti deve essere marcato con il tag #NSFW - Not Safe For Work)";
+$a->strings["Security and Privacy Settings"] = "Impostazioni di sicurezza e privacy";
+$a->strings["Hide my online presence"] = "Non mostrare la mia presenza online";
+$a->strings["Prevents displaying in your profile that you are online"] = "Non mostra sul tuo profilo che sei online";
+$a->strings["Simple Privacy Settings:"] = "Impostazioni di privacy semplificate";
+$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>";
+$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Standard - <em>contenuti normalmente pubblici, ma anche privati se necessario (simile ai social network ma con privacy migliorata)</em>";
+$a->strings["Private - <em>default private, never open or public</em>"] = "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>";
+$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloccato - <em>bloccato in ricezione e invio</em>";
+$a->strings["Advanced Privacy Settings"] = "Impostazioni di privacy avanzate";
+$a->strings["Maximum Friend Requests/Day:"] = "Numero massimo giornaliero di richieste di amicizia:";
+$a->strings["May reduce spam activity"] = "Serve e ridurre lo spam";
+$a->strings["Default Post Permissions"] = "Permessi predefiniti per gli articoli";
+$a->strings["Maximum private messages per day from unknown people:"] = "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:";
+$a->strings["Useful to reduce spamming"] = "Serve e ridurre lo spam";
+$a->strings["Notification Settings"] = "Impostazioni di notifica";
+$a->strings["By default post a status message when:"] = "Pubblica un messaggio di stato quando:";
+$a->strings["accepting a friend request"] = "accetto una nuova amicizia";
+$a->strings["joining a forum/community"] = "entro a far parte di un forum";
+$a->strings["making an <em>interesting</em> profile change"] = "faccio un cambiamento <em>interessante</em> al mio profilo";
+$a->strings["Send a notification email when:"] = "Invia una email di notifica quando:";
+$a->strings["You receive an introduction"] = "Ricevi una richiesta di amicizia";
+$a->strings["Your introductions are confirmed"] = "Le tue richieste di amicizia sono state accettate";
+$a->strings["Someone writes on your profile wall"] = "Qualcuno scrive sulla tua bacheca";
+$a->strings["Someone writes a followup comment"] = "Qualcuno scrive un commento a un tuo articolo";
+$a->strings["You receive a private message"] = "Ricevi un messaggio privato";
+$a->strings["You receive a friend suggestion"] = "Ti viene suggerito un amico";
+$a->strings["You are tagged in a post"] = "Sei taggato in un articolo";
+$a->strings["You are poked/prodded/etc. in a post"] = "Ricevi un poke in un articolo";
+$a->strings["Advanced Account/Page Type Settings"] = "Impostazioni avanzate";
+$a->strings["Change the behaviour of this account for special situations"] = "Cambia il funzionamento di questo account in situazioni particolari";
+$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Abilita la modalità esperto per fare cambiamenti! (in Impostazioni > Funzionalità aggiuntive)";
$a->strings["Nothing to import."] = "Non c'è niente da importare.";
$a->strings["Unable to download data from old server"] = "Impossibile importare i dati dal vecchio server";
$a->strings["Imported file is empty."] = "Il file da importare è vuoto.";
diff --git a/view/js/main.js b/view/js/main.js
index 44cb79949..fa96596f4 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -197,58 +197,34 @@
/* setup field_richtext */
setupFieldRichtext();
- /* popup menus */
- function close_last_popup_menu() {
- if(last_popup_menu) {
- last_popup_menu.hide();
-/* last_popup_button.removeClass("selected"); */
- last_popup_menu = null;
- last_popup_button = null;
- }
- }
/* Turn elements with one of our special rel tags into popup menus */
+ /* CHANGES: let bootstrap handle popups and only do the loading here */
$('a[rel^=#]').click(function(e){
manage_popup_menu(this,e);
- return false;
+ return;
});
$('span[rel^=#]').click(function(e){
manage_popup_menu(this,e);
- return false;
+ return;
});
function manage_popup_menu(w,e) {
- close_last_popup_menu();
menu = $( $(w).attr('rel') );
- e.preventDefault();
- e.stopPropagation();
- if (menu.attr('popup')=="false") return false;
-/* $(w).parent().toggleClass("selected"); */
+
/* notification menus are loaded dynamically
* - here we find a rel tag to figure out what type of notification to load */
+
var loader_source = $(menu).attr('rel');
if(typeof(loader_source) != 'undefined' && loader_source.length) {
notify_popup_loader(loader_source);
}
- menu.toggle();
- if (menu.css("display") == "none") {
- last_popup_menu = null;
- last_popup_button = null;
- } else {
- last_popup_menu = menu;
- last_popup_button = $(w).parent();
- }
- return false;
}
-
- $('html').click(function() {
- close_last_popup_menu();
- });
-
+
// fancyboxes
$("a.popupbox").fancybox({
'transitionIn' : 'elastic',
@@ -324,46 +300,46 @@
if(data.network == 0) {
data.network = '';
- $('#net-update').removeClass('show')
+ $('.net-update').removeClass('show')
}
else {
- $('#net-update').addClass('show')
+ $('.net-update').addClass('show')
}
- $('#net-update').html(data.network);
+ $('.net-update').html(data.network);
- if(data.home == 0) { data.home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
- $('#home-update').html(data.home);
+ if(data.home == 0) { data.home = ''; $('.home-update').removeClass('show') } else { $('.home-update').addClass('show') }
+ $('.home-update').html(data.home);
- if(data.intros == 0) { data.intros = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
- $('#intro-update').html(data.intros);
+ if(data.intros == 0) { data.intros = ''; $('.intro-update').removeClass('show') } else { $('.intro-update').addClass('show') }
+ $('.intro-update').html(data.intros);
- if(data.mail == 0) { data.mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
- $('#mail-update').html(data.mail);
+ if(data.mail == 0) { data.mail = ''; $('.mail-update').removeClass('show') } else { $('.mail-update').addClass('show') }
+ $('.mail-update').html(data.mail);
- if(data.notify == 0) { data.notify = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
- $('#notify-update').html(data.notify);
+ if(data.notify == 0) { data.notify = ''; $('.notify-update').removeClass('show') } else { $('.notify-update').addClass('show') }
+ $('.notify-update').html(data.notify);
- if(data.register == 0) { data.register = ''; $('#register-update').removeClass('show') } else { $('#register-update').addClass('show') }
- $('#register-update').html(data.register);
+ if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show') } else { $('.register-update').addClass('show') }
+ $('.register-update').html(data.register);
- if(data.events == 0) { data.events = ''; $('#events-update').removeClass('show') } else { $('#events-update').addClass('show') }
- $('#events-update').html(data.events);
+ if(data.events == 0) { data.events = ''; $('.events-update').removeClass('show') } else { $('.events-update').addClass('show') }
+ $('.events-update').html(data.events);
- if(data.events_today == 0) { data.events_today = ''; $('#events-today-update').removeClass('show') } else { $('#events-today-update').addClass('show') }
- $('#events-today-update').html(data.events_today);
+ if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show') } else { $('.events-today-update').addClass('show') }
+ $('.events-today-update').html(data.events_today);
- if(data.birthdays == 0) { data.birthdays = ''; $('#birthdays-update').removeClass('show') } else { $('#birthdays-update').addClass('show') }
- $('#birthdays-update').html(data.birthdays);
+ if(data.birthdays == 0) { data.birthdays = ''; $('.birthdays-update').removeClass('show') } else { $('.birthdays-update').addClass('show') }
+ $('.birthdays-update').html(data.birthdays);
- if(data.birthdays_today == 0) { data.birthdays_today = ''; $('#birthdays-today-update').removeClass('show') } else { $('#birthdays-today-update').addClass('show') }
- $('#birthdays-today-update').html(data.birthdays_today);
+ if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show') } else { $('.birthdays-today-update').addClass('show') }
+ $('.birthdays-today-update').html(data.birthdays_today);
- if(data.all_events == 0) { data.all_events = ''; $('#all_events-update').removeClass('show') } else { $('#all_events-update').addClass('show') }
- $('#all_events-update').html(data.all_events);
- if(data.all_events_today == 0) { data.all_events_today = ''; $('#all_events-today-update').removeClass('show') } else { $('#all_events-today-update').addClass('show') }
- $('#all_events-today-update').html(data.all_events_today);
+ if(data.all_events == 0) { data.all_events = ''; $('.all_events-update').removeClass('show') } else { $('.all_events-update').addClass('show') }
+ $('.all_events-update').html(data.all_events);
+ if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show') } else { $('.all_events-today-update').addClass('show') }
+ $('.all_events-today-update').html(data.all_events_today);
$(data.notice).each(function() {
@@ -671,8 +647,7 @@ function updateConvItems(mode,data) {
$(data.notify).each(function() {
- text = "<span class='contactname'>"+this.name+"</span>" + ' ' + this.message + '<br />';
- html = notifications_tpl.format(this.notify_link,this.photo,text,this.when,this.class);
+ html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class);
$("#nav-" + notifyType + "-menu").append(html);
});
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 16101db57..8cd062f43 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -72,12 +72,12 @@ function channel_privacy_macro(n) {
$('#id_profile_in_directory').val(0);
}
if(n == 2) {
- $('#id_view_stream option').eq(5).attr('selected','selected');
- $('#id_view_profile option').eq(5).attr('selected','selected');
- $('#id_view_photos option').eq(5).attr('selected','selected');
- $('#id_view_contacts option').eq(5).attr('selected','selected');
- $('#id_view_storage option').eq(5).attr('selected','selected');
- $('#id_view_pages option').eq(5).attr('selected','selected');
+ $('#id_view_stream option').eq(6).attr('selected','selected');
+ $('#id_view_profile option').eq(6).attr('selected','selected');
+ $('#id_view_photos option').eq(6).attr('selected','selected');
+ $('#id_view_contacts option').eq(6).attr('selected','selected');
+ $('#id_view_storage option').eq(6).attr('selected','selected');
+ $('#id_view_pages option').eq(6).attr('selected','selected');
$('#id_send_stream option').eq(2).attr('selected','selected');
$('#id_post_wall option').eq(1).attr('selected','selected');
$('#id_post_comments option').eq(2).attr('selected','selected');
@@ -95,12 +95,12 @@ function channel_privacy_macro(n) {
$('#id_profile_in_directory').val(1);
}
if(n == 3) {
- $('#id_view_stream option').eq(5).attr('selected','selected');
- $('#id_view_profile option').eq(5).attr('selected','selected');
- $('#id_view_photos option').eq(5).attr('selected','selected');
- $('#id_view_contacts option').eq(5).attr('selected','selected');
- $('#id_view_storage option').eq(5).attr('selected','selected');
- $('#id_view_pages option').eq(5).attr('selected','selected');
+ $('#id_view_stream option').eq(6).attr('selected','selected');
+ $('#id_view_profile option').eq(6).attr('selected','selected');
+ $('#id_view_photos option').eq(6).attr('selected','selected');
+ $('#id_view_contacts option').eq(6).attr('selected','selected');
+ $('#id_view_storage option').eq(6).attr('selected','selected');
+ $('#id_view_pages option').eq(6).attr('selected','selected');
$('#id_send_stream option').eq(4).attr('selected','selected');
$('#id_post_wall option').eq(4).attr('selected','selected');
$('#id_post_comments option').eq(4).attr('selected','selected');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 78fdac0cd..5d603c810 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -140,6 +140,8 @@ blockquote {
filter:alpha(opacity=100);
}
+/* this is not yet supported
+
nav {
background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
@@ -151,8 +153,6 @@ nav {
}
-
-
nav:hover {
background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
@@ -163,7 +163,7 @@ nav:hover {
filter:alpha(opacity=100);
}
-
+*/
nav #site-location {
color: #888a85;
@@ -204,15 +204,15 @@ header #site-location {
}
header #banner {
-
overflow: hidden;
text-align: center;
- font-size: 1.4em;
+ font-size: 14px;
font-family: tahoma, "Lucida Sans", sans;
color: $banner_colour;
font-weight: bold;
- margin-top: 1px;
+ margin-top: 14px;
}
+
header #banner a,
header #banner a:active,
header #banner a:visited,
@@ -879,8 +879,8 @@ footer {
}
#nav-search-spinner {
- float: right;
- margin: 12px 12px 0px 0px;
+ float: left;
+ margin: 25px 0px 0px 25px;
color: #fff;
}
@@ -892,6 +892,7 @@ footer {
#nav-search-text {
height: 20px;
+ margin: 15px;
padding: 0px 5px 0px 5px;
border-radius: 10px;
border: none;
@@ -919,11 +920,6 @@ footer {
font-family: FontAwesome;
}
-#nav-user-linkmenu img {
- border-radius: $radiuspx;
- margin-top: -4px;
-}
-
.nav-dropdown-indicator {
opacity: 0.8;
filter:alpha(opacity=80);
@@ -1548,8 +1544,8 @@ div.jGrowl div.info {
#nav-search-text-ac .autocomplete {
position: fixed;
- top: 24px;
- border: 1px solid $nav_bg_1;
+ top: 51px;
+ border: 1px solid #222;
border-top: none;
}
@@ -1628,26 +1624,6 @@ nav .fakelink:hover { text-decoration: none; }
color: #000000;
}
-nav ul {
- margin: 0px;
- padding: 0px 20px;
-}
-nav ul li {
- list-style: none;
- margin: 0px;
- padding: 0px;
- float: left;
-}
-nav ul li .menu-popup {
- left: 0px;
- right: auto;
- top: 33px;
-}
-
-#nav-user-linkmenu {
- margin-left: 5px;
-}
-
nav .nav-menu-icon {
position: relative;
height: 22px;
@@ -1785,13 +1761,10 @@ header {
position: fixed;
left: 43%;
right: 43%;
- top: 0px;
margin: 0px;
padding: 0px;
- /*width: 100%; height: 12px; */
-
- z-index: 110;
- color: #ffffff;
+ z-index: 1400;
+ color: #fff;
}
@@ -2469,3 +2442,38 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
background-color: #eee;
}
+
+/* nav bootstrap */
+nav i {
+ font-size: 14px;
+}
+
+nav img {
+ height: 47px;
+ width: 47px;
+ margin: 2px 0px 1px 10px;
+ border-radius: $radiuspx;
+}
+
+nav ul li {
+ max-height: 50px
+}
+
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link {
+ color: #333;
+}
+
+nav .badge {
+ border-radius: $radiuspx;
+}
+
+nav .dropdown-menu {
+ font-size: $body_font_size;
+ border-top-right-radius: 0px;
+ border-top-left-radius: 0px;
+ border-bottom-right-radius: $radiuspx;
+ border-bottom-left-radius: $radiuspx;
+}
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index ca05986a2..cc573d99e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -4,7 +4,7 @@
</div>
{{if $expert}}
-{{include file="field_select.tpl" field=$nav_colour}}
+{{* 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}}
@@ -19,7 +19,7 @@
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$converse_width}}
-{{include file="field_input.tpl" field=$nav_min_opacity}}
+{{* include file="field_input.tpl" field=$nav_min_opacity *}}
{{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
{{include file="field_checkbox.tpl" field=$sloppy_photos}}
diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl
index 7b88c6440..1995b95e1 100644
--- a/view/tpl/filestorage.tpl
+++ b/view/tpl/filestorage.tpl
@@ -2,13 +2,14 @@
<div class="generic-content-wrapper">
{{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}}
-
+ <br />
+ <br />
{{foreach $files as $key => $items}}
{{foreach $items as $item}}
<div class="files-list-item">
- <a href="{{$baseurl}}/{{$item.id}}/edit">{{$edit}}</a>&nbsp;&nbsp;&nbsp;|
- <a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}}</a> |&nbsp;&nbsp;&nbsp;
+ <a href="{{$baseurl}}/{{$item.id}}/edit" title="{{$edit}}"><i class="icon-pencil"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;
+ <a href="{{$baseurl}}/{{$item.id}}/delete" title="{{$delete}}"><i class="icon-remove drop-icons"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;
{{if ! $item.dir}}<a href="attach/{{$item.download}}">{{/if}}{{$item.title}}{{if ! $item.dir}}</a>{{/if}}
{{if ! $item.dir}} | {{$item.size}} bytes{{else}}{{$directory}}{{/if}}
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index eb4c6c2ad..b96c46dd7 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,5 +1,6 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="{{$baseurl}}/" />
+<meta name="viewport" content="width=device-width, initial-scale=0">
<meta name="generator" content="{{$generator}}" />
<!--[if IE]>
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 057665d49..421b610f1 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -5,11 +5,12 @@
<a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a>
<br />
+<br />
{{if $mlist }}
-<ul id="mitemlist">
+<ul id="mitemlist" class="menu-item-list">
{{foreach $mlist as $m }}
-<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}>{{$drop}}</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li>
+<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li>
{{/foreach}}
</ul>
{{/if}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 048f53743..ba8d68b13 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,151 +1,184 @@
<header>
- <div id="site-location">{{$sitelocation}}</div>
- <div id="banner">{{$banner}}</div>
+<!-- <div id="site-location">{{$sitelocation}}</div> -->
+ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
</header>
-<nav>
- <ul>
- {{if $userinfo}}
- <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">&#x25BC;</span></a>
- {{if $localuser}}
- <ul id="nav-user-menu" class="menu-popup">
- {{foreach $nav.usermenu as $usermenu}}
- <li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
- {{/foreach}}
- {{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}
- {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
- {{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
- {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-
- {{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
- {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-
- </ul>
- {{/if}}
- </li>
- {{/if}}
-
-
- {{if $nav.lock}}
- <li id="nav-rmagic-link" class="nav-menu-icon" >
- <i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;" title="{{$nav.lock.3}}" ></i>
- </li>
- {{/if}}
-
-
- {{if $nav.network}}
- <li id="nav-network-link" class="nav-menu {{$sel.network}}">
- <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a>
- <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span>
- <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
- {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
- <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
- </ul>
- </li>
- {{/if}}
-
- {{if $nav.home}}
- <li id="nav-home-link" class="nav-menu {{$sel.home}}">
- <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a>
- <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span>
- <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
- {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
- <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
- </ul>
- </li>
- {{/if}}
-
- {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
-
-
- {{if $nav.messages}}
- <li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
- <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope nav-icon"></i></a>
- <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
- <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
- <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
- <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
- </ul>
- </li>
- {{/if}}
-
- {{if $nav.all_events}}
- <li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
- <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar nav-icon"></i></a>
- <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
- <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
- <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
- <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
- </ul>
- </li>
- {{/if}}
-
- {{if $nav.intros}}
- <li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
- <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user nav-icon"></i></a>
- <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
- <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
- <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
- </ul>
- </li>
- {{/if}}
+<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ {{if $userinfo}}
+ <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span>
+ {{if $localuser}}
+ <ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
+ {{foreach $nav.usermenu as $usermenu}}
+ <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li>
+ {{/foreach}}
+ {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}}
+ {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}}
+ {{if $nav.contacts}}<li role="presentation"><a href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" role="menuitem">{{$nav.contacts.1}}</a></li>{{/if}}
+ {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}}
+ {{if $nav.admin}}<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>{{/if}}
+ {{if $nav.logout}}
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li>
+ {{/if}}
+ </ul>
+ {{/if}}
+ {{/if}}
+ </div>
+ <div class="collapse navbar-collapse" id="navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-left">
+ {{if $nav.lock}}
+ <li>
+ <a class="fakelink" title="{{$nav.lock.3}}" onclick="window.location.href='{{$nav.lock.0}}'; return false;"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a>
+ </li>
+ {{/if}}
+
+ {{if $nav.network}}
+ <li class="{{$sel.network}} hidden-xs">
+ <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
+ <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>
+ <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">
+ {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
+ <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.network}} visible-xs">
+ <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
+ <span class="net-update badge" rel="#nav-network-menu"></span>
+ </li>
+ {{/if}}
+
+ {{if $nav.home}}
+ <li class="{{$sel.home}} hidden-xs">
+ <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
+ <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>
+ <ul id="nav-home-menu" class="dropdown-menu" rel="home">
+ {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
+ <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.home}} visible-xs">
+ <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
+ <span class="home-update badge"rel="#nav-home-menu"></span>
+ </li>
+ {{/if}}
+
+ {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
+
+ {{if $nav.messages}}
+ <li class="{{$sel.messages}} hidden-xs">
+ <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a>
+ <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>
+ <ul id="nav-messages-menu" class="dropdown-menu" rel="messages">
+ <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
+ <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.messages}} visible-xs">
+ <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a>
+ <span class="mail-update badge" rel="#nav-messages-menu"></span>
+ </li>
+ {{/if}}
+
+ {{if $nav.all_events}}
+ <li class="{{$sel.all_events}} hidden-xs">
+ <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a>
+ <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>
+ <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
+ <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
+ <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.all_events}} visible-xs">
+ <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a>
+ <span class="all_events-update badge" rel="#nav-all_events-menu"></span>
+ </li>
+ {{/if}}
+
+ {{if $nav.intros}}
+ <li class="{{$sel.intros}} hidden-xs">
+ <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a>
+ <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>
+ <ul id="nav-intros-menu" class="dropdown-menu" rel="intros">
+ <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.intros}} visible-xs">
+ <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a>
+ <span class="intro-update badge" rel="#nav-intros-menu"></span>
+ </li>
+ {{/if}}
- {{if $nav.notifications}}
- <li id="nav-notify-linkmenu" class="nav-menu fakelink {{$sel.notifications}}">
- <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation nav-icon"></i></a>
- <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
- <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
- <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
- <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
- <li class="empty">{{$emptynotifications}}</li>
+ {{if $nav.notifications}}
+ <li class="{{$sel.notifications}} hidden-xs">
+ <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a>
+ <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>
+ <ul id="nav-notify-menu" class="dropdown-menu" rel="notify">
+ <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+ <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
+ <li class="empty">{{$emptynotifications}}</li>
+ </ul>
+ </li>
+ <li class="{{$sel.notifications}} visible-xs">
+ <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a>
+ <span class="notify-update badge" rel="#nav-notify-menu"></span>
+ </li>
+ {{/if}}
</ul>
- </li>
- {{/if}}
-
- {{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
- {{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
-
- {{if $nav.directory}}
- <li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
- <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap nav-icon"></i></a>
- </li>
- {{/if}}
-
- {{if $nav.help}}
- <li id="nav-help-link" class="nav-menu {{$sel.help}}">
- <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question nav-icon"></i></a>
- </li>
- {{/if}}
-
- {{if $nav.apps}}
- <li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
- <a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs nav-icon"></i></a>
- <ul id="nav-apps-menu" class="menu-popup">
- {{foreach $apps as $ap}}
- <li>{{$ap}}</li>
- {{/foreach}}
+ <ul class="nav navbar-nav navbar-right">
+ <li class="hidden-xs">
+ <form method="get" action="search" role="search">
+ <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002;" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
+ </form>
+ </li>
+ <li class="visible-xs">
+ <a href="/search" title="Search"><i class="icon-search"></i></a>
+ </li>
+
+ {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+
+ {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
+
+ {{if $nav.directory}}
+ <li class="{{$sel.directory}}">
+ <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a>
+ </li>
+ {{/if}}
+
+ {{if $nav.apps}}
+ <li class="{{$sel.apps}} hidden-xs">
+ <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a>
+ <ul id="nav-apps-menu" class="dropdown-menu">
+ {{foreach $apps as $ap}}
+ <li>{{$ap}}</li>
+ {{/foreach}}
+ </ul>
+ </li>
+ {{/if}}
+
+ {{if $nav.help}}
+ <li class="{{$sel.help}}">
+ <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
+ </li>
+ {{/if}}
</ul>
- </li>
- {{/if}}
-
- <li id="nav-searchbar">
- <form method="get" action="search">
- <input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002;" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
- </form>
- </li>
- <div id="nav-search-spinner"></div>
-
- </ul>
+ </div>
+ </div>
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+ <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
</ul>
{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 808078413..f5f2206bc 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -59,10 +59,14 @@
</div>
<div class="settings-common-perms">
+
+
{{$profile_in_dir}}
{{$suggestme}}
+{{include file="field_yesno.tpl" field=$blocktags}}
+
{{include file="field_input.tpl" field=$maxreq}}
{{include file="field_input.tpl" field=$cntunkmail}}
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 3904f4696..80e160fdf 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,6 +2,9 @@
{{if $menu.menu_desc}}
<h3 class="pmenu-title">{{$menu.menu_desc}}</h3>
{{/if}}
+{{if $edit}}
+<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>
+{{/if}}
{{if $items }}
<ul class="pmenu-body">
{{foreach $items as $mitem }}