diff options
| -rw-r--r-- | include/attach.php | 196 | ||||
| -rw-r--r-- | mod/settings.php | 22 | ||||
| -rw-r--r-- | util/messages.po | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 48 | ||||
| -rw-r--r-- | view/css/default.css | 14 | ||||
| -rw-r--r-- | view/css/mod_settings.css | 14 | ||||
| -rw-r--r-- | view/css/widgets.css | 3 | ||||
| -rw-r--r-- | view/de/messages.po | 2 | ||||
| -rw-r--r-- | view/de/strings.php | 2 | ||||
| -rw-r--r-- | view/it/messages.po | 1591 | ||||
| -rw-r--r-- | view/it/strings.php | 315 | ||||
| -rw-r--r-- | view/js/icon_translate.js | 1 | ||||
| -rw-r--r-- | view/js/main.js | 89 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 88 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/chanview.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 311 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 19 |
20 files changed, 1468 insertions, 1258 deletions
diff --git a/include/attach.php b/include/attach.php index af1159957..a3ee3f0ef 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1,7 +1,8 @@ -<?php /** @file */ +<?php -/* - * File/attach API with the potential for revision control. +/** @file + * + * @brief File/attach API with the potential for revision control. * * TODO: a filesystem storage abstraction which maintains security (and 'data' contains a system filename * which is inaccessible from the web). This could get around PHP storage limits and store videos and larger @@ -12,6 +13,15 @@ require_once('include/permissions.php'); require_once('include/security.php'); +/** + * @brief Guess the mimetype from file ending. + * + * This function takes a file name and guess the mimetype from the + * filename extension. + * + * @param $filename a string filename + * @return string The mimetype according to a file ending. + */ function z_mime_content_type($filename) { $mime_types = array( @@ -80,8 +90,6 @@ function z_mime_content_type($filename) { if (array_key_exists($ext, $mime_types)) { return $mime_types[$ext]; } - - } return 'application/octet-stream'; @@ -89,7 +97,20 @@ function z_mime_content_type($filename) { } - +/** + * @brief Count files/attachments. + * + * + * @param $channel_id + * @param $observer + * @param $hash (optional) + * @param $filename (optional) + * @param $filetype (optional) + * @return array + * $ret['success'] boolean + * $ret['results'] amount of found results, or false + * $ret['message'] string with error messages if any + */ function attach_count_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '') { $ret = array('success' => false); @@ -121,6 +142,22 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '', } +/** + * @brief Returns a list of files/attachments. + * + * @param $channel_id + * @param $observer + * @param $hash (optional) + * @param $filename (optional) + * @param $filetype (optional) + * @param $orderby + * @param $start + * @param $entries + * @return array + * $ret['success'] boolean + * $ret['results'] array with results, or false + * $ret['message'] string with error messages if any + */ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0) { $ret = array('success' => false); @@ -157,10 +194,17 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $ } -// Find an attachment by hash and revision. Returns the entire attach structure including data. -// This could exhaust memory so most useful only when immediately sending the data. - -function attach_by_hash($hash,$rev = 0) { +/** + * @brief Find an attachment by hash and revision. + * + * Returns the entire attach structure including data. + * + * This could exhaust memory so most useful only when immediately sending the data. + * + * @param $hash + * @param $rev + */ +function attach_by_hash($hash, $rev = 0) { $ret = array('success' => false); @@ -181,7 +225,7 @@ function attach_by_hash($hash,$rev = 0) { return $ret; } - if(! perm_is_allowed($r[0]['uid'],get_observer_hash(),'view_storage')) { + if(! perm_is_allowed($r[0]['uid'], get_observer_hash(), 'view_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -190,14 +234,13 @@ function attach_by_hash($hash,$rev = 0) { // Now we'll see if we can access the attachment - $r = q("SELECT * FROM attach WHERE hash = '%s' and uid = %d $sql_extra LIMIT 1", dbesc($hash), intval($r[0]['uid']) ); if(! $r) { - $ret['message'] = t('Permission denied.'); + $ret['message'] = t('Permission denied.'); return $ret; } @@ -207,9 +250,16 @@ function attach_by_hash($hash,$rev = 0) { } - - -function attach_by_hash_nodata($hash,$rev = 0) { +/** + * @brief Find an attachment by hash and revision. + * + * Returns the entire attach structure excluding data. + * + * @see attach_by_hash() + * @param $hash + * @param $ref + */ +function attach_by_hash_nodata($hash, $rev = 0) { $ret = array('success' => false); @@ -244,7 +294,7 @@ function attach_by_hash_nodata($hash,$rev = 0) { ); if(! $r) { - $ret['message'] = t('Permission denied.'); + $ret['message'] = t('Permission denied.'); return $ret; } @@ -254,17 +304,21 @@ function attach_by_hash_nodata($hash,$rev = 0) { } - - - -function attach_store($channel,$observer_hash,$options = '',$arr = null) { - +/** + * @brief + * + * @param $channel channel array of owner + * @param $observer_hash hash of current observer + * @param $options (optional) + * @param $arr (optional) + */ +function attach_store($channel, $observer_hash, $options = '', $arr = null) { $ret = array('success' => false); $channel_id = $channel['channel_id']; $sql_options = ''; - if(! perm_is_allowed($channel_id,get_observer_hash(),'write_storage')) { + if(! perm_is_allowed($channel_id,get_observer_hash(), 'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -308,7 +362,7 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { if($options === 'update' && $arr && array_key_exists('revision',$arr)) $sql_options = " and revision = " . intval($arr['revision']) . " "; - $x =q("select id, aid, uid, filename, filetype, filesize, hash, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1", + $x = q("select id, aid, uid, filename, filetype, filesize, hash, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1", dbesc($arr['hash']), intval($channel_id) ); @@ -329,14 +383,14 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { return $ret; } - $limit = service_class_fetch($channel_id,'attach_upload_limit'); + $limit = service_class_fetch($channel_id, 'attach_upload_limit'); if($limit !== false) { $r = q("select sum(filesize) as total from attach where aid = %d ", intval($channel['channel_account_id']) ); if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) { - $ret['message'] = upgrade_message(true).sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."),$limit / 1024000); + $ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000); @unlink($src); return $ret; } @@ -379,7 +433,6 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { dbesc($x[0]['deny_gid']) ); } - elseif($options === 'update') { $r = q("update attach set filename = '%s', filetype = '%s', edited = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d limit 1", @@ -394,7 +447,6 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { intval($x[0]['uid']) ); } - else { $r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, data, created, edited, allow_cid, allow_gid,deny_cid, deny_gid ) VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ", @@ -441,12 +493,11 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { return $ret; } - /** * Read a virtual directory and return contents, checking permissions of all parent components. * @function z_readdir * @param integer $channel_id - * @param string $observer_hash + * @param string $observer_hash hash of current observer * @param string $pathname * @param string $parent_hash (optional) * @@ -455,18 +506,16 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { * $ret['message'] = error message if success is false * $ret['data'] = array of attach DB entries without data component */ - -function z_readdir($channel_id,$observer_hash,$pathname, $parent_hash = '') { +function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') { $ret = array('success' => false); - if(! perm_is_allowed($r[0]['uid'],get_observer_hash(),'view_storage')) { + if(! perm_is_allowed($r[0]['uid'], get_observer_hash(), 'view_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } - - if(strpos($pathname,'/')) { - $paths = explode('/',$pathname); + if(strpos($pathname, '/')) { + $paths = explode('/', $pathname); if(count($paths) > 1) { $curpath = array_shift($paths); @@ -480,7 +529,7 @@ function z_readdir($channel_id,$observer_hash,$pathname, $parent_hash = '') { return $ret; } - return z_readdir($channel_id,$observer_hash,implode('/',$paths),$r[0]['hash']); + return z_readdir($channel_id, $observer_hash, implode('/', $paths), $r[0]['hash']); } } else @@ -501,20 +550,17 @@ function z_readdir($channel_id,$observer_hash,$pathname, $parent_hash = '') { return $ret; } - /** * @function attach_mkdir($channel,$observer_hash,$arr); * - * Create directory + * @brief Create directory. * * @param $channel channel array of owner * @param $observer_hash hash of current observer * @param $arr parameter array to fulfil request - * * Required: * $arr['filename'] * $arr['folder'] // hash of parent directory, empty string for root directory - * * Optional: * $arr['hash'] // precumputed hash for this node * $arr['allow_cid'] @@ -522,8 +568,7 @@ function z_readdir($channel_id,$observer_hash,$pathname, $parent_hash = '') { * $arr['deny_cid'] * $arr['deny_gid'] */ - -function attach_mkdir($channel,$observer_hash,$arr = null) { +function attach_mkdir($channel, $observer_hash, $arr = null) { $ret = array('success' => false); $channel_id = $channel['channel_id']; @@ -534,10 +579,9 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { logger('attach_mkdir: basepath: ' . $basepath); if(! is_dir($basepath)) - mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS,true); + mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS, true); - - if(! perm_is_allowed($channel_id, $observer_hash,'write_storage')) { + if(! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -547,10 +591,8 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { return $ret; } - $arr['hash'] = (($arr['hash']) ? $arr['hash'] : random_string()); - // Check for duplicate name. // Check both the filename and the hash as we will be making use of both. @@ -576,7 +618,6 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { $sql_options = permissions_sql($channel['channel_id']); do { - $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d ) $sql_options limit 1", intval($channel['channel_id']), @@ -594,7 +635,6 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { $lfile = $r[0]['folder']; } while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ; $path = $basepath . '/' . $lpath; - } else $path = $basepath . '/'; @@ -625,7 +665,7 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { ); if($r) { - if(mkdir($path,STORAGE_DEFAULT_PERMISSIONS,true)) { + if(mkdir($path,STORAGE_DEFAULT_PERMISSIONS, true)) { $ret['success'] = true; $ret['data'] = $arr; } @@ -641,9 +681,18 @@ function attach_mkdir($channel,$observer_hash,$arr = null) { } - - -function attach_change_permissions($channel_id,$resource,$allow_cid,$allow_gid,$deny_cid,$deny_gid,$recurse = false) { +/** + * @brief Changes permissions of a file. + * + * @param $channel_id + * @param $resource + * @param $allow_cid + * @param $allow_gid + * @param $deny_cid + * @param $deny_gid + * @param $recurse + */ +function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse = false) { $r = q("select hash, flags from attach where hash = '%s' and uid = %d limit 1", dbesc($resource), @@ -661,7 +710,7 @@ function attach_change_permissions($channel_id,$resource,$allow_cid,$allow_gid,$ ); if($r) { foreach($r as $rr) { - attach_change_permissions($channel_id,$resource,$allow_cid,$allow_gid,$deny_cid,$deny_gid,$recurse); + attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse); } } } @@ -679,9 +728,13 @@ function attach_change_permissions($channel_id,$resource,$allow_cid,$allow_gid,$ return; } - - -function attach_delete($channel_id,$resource) { +/** + * @brief Delete a file. + * + * @param $channel_id + * @param $resource + */ +function attach_delete($channel_id, $resource) { $c = q("select channel_address from channel where channel_id = %d limit 1", @@ -706,7 +759,7 @@ function attach_delete($channel_id,$resource) { ); if($x) { foreach($x as $xx) { - attach_delete($channel_id,$xx['hash']); + attach_delete($channel_id, $xx['hash']); } } } @@ -733,8 +786,12 @@ function attach_delete($channel_id,$resource) { return; } - - +/** + * @brief Returns path to file in cloud/. + * + * @param $arr + * @return string with the path the file to cloud/ + */ function get_cloudpath($arr) { $basepath = 'cloud/'; @@ -746,7 +803,6 @@ function get_cloudpath($arr) { $basepath .= $r[0]['channel_address'] . '/'; } - $path = $basepath; if($arr['folder']) { @@ -772,20 +828,20 @@ function get_cloudpath($arr) { } while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ; $path .= $lpath; - } $path .= $arr['filename']; return $path; - } - - - +/** + * + * @param $in + * @param $out + */ function pipe_streams($in, $out) { $size = 0; - while (!feof($in)) - $size += fwrite($out,fread($in,8192)); + while (!feof($in)) + $size += fwrite($out, fread($in,8192)); return $size; -}
\ No newline at end of file +} diff --git a/mod/settings.php b/mod/settings.php index 5b0a8e8f2..e9f4c9f8d 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -261,7 +261,7 @@ function settings_post(&$a) { $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); - + $channel_menu = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu'])) : ''); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); @@ -403,7 +403,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); set_pconfig(local_user(),'system','blocktags',$blocktags); set_pconfig(local_user(),'system','hide_online_status',$hide_presence); - + set_pconfig(local_user(),'system','channel_menu',$channel_menu); $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_a_bookmark = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d limit 1", dbesc($username), @@ -758,7 +758,7 @@ function settings_content(&$a) { '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), - '$chanview_full' => array('chanview_full', t('View remote profiles as webpages'), $chanview, t('By default open in a sub-window of your own site')), + '$chanview_full' => array('chanview_full', t('Do not view remote profiles in frames'), $chanview, t('By default open in a sub-window of your own site')), '$theme_config' => $theme_config, )); @@ -911,6 +911,18 @@ function settings_content(&$a) { require_once('include/group.php'); $group_select = mini_group_select(local_user(),$channel['channel_default_group']); + require_once('include/menu.php'); + $m1 = menu_list(local_user()); + $menu = false; + if($m1) { + $menu = array(); + $current = get_pconfig(local_user(),'system','channel_menu'); + $menu[] = array('name' => '', 'selected' => ((! $current) ? true : false)); + foreach($m1 as $m) { + $menu[] = array('name' => htmlspecialchars($m['menu_name'],ENT_COMPAT,'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false)); + } + } + $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), @@ -981,7 +993,9 @@ function settings_content(&$a) { '$pagetype' => $pagetype, '$expert' => feature_enabled(local_user(),'expert'), '$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'), - + '$lbl_misc' => t('Miscellaneous Settings'), + '$menus' => $menu, + '$menu_desc' => t('Personal menu to display in your channel pages'), )); call_hooks('settings_form',$o); diff --git a/util/messages.po b/util/messages.po index 5b8249a48..da8ce5868 100644 --- a/util/messages.po +++ b/util/messages.po @@ -5979,7 +5979,7 @@ msgid "Don't show emoticons" msgstr "" #: ../../mod/settings.php:761 -msgid "View remote profiles as webpages" +msgid "Do not view remote profiles in frames" msgstr "" #: ../../mod/settings.php:761 diff --git a/version.inc b/version.inc index 4551fa398..9e1971efd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-18.592 +2014-02-19.593 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_settings.css b/view/css/mod_settings.css index 0d3dd36fe..5b0105204 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -35,3 +35,17 @@ margin-bottom: 15px; } +#settings-menu-desc { + font-weight: bold; + float: left; + width: 350px; +} + +#settings-channel-menu-div select { + float: left; +} + +#settings-channel-menu-end { + clear: both; + margin-bottom: 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 7acbdcdd2..f98726f4d 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -5994,7 +5994,7 @@ msgid "Don't show emoticons" msgstr "Emoticons nicht zeigen" #: ../../mod/settings.php:761 -msgid "View remote profiles as webpages" +msgid "Do not view remote profiles in frames" msgstr "" #: ../../mod/settings.php:761 diff --git a/view/de/strings.php b/view/de/strings.php index ac1abc8f7..4001d78be 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1410,7 +1410,7 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Ma $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["Do not view remote profiles in frames"] = ""; $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"; diff --git a/view/it/messages.po b/view/it/messages.po index 372d5b099..98d531562 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 "Do not view remote profiles in frames" +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..42b91f2fa 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["Do not view remote profiles in frames"] = "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/icon_translate.js b/view/js/icon_translate.js index 737164cb8..45deef05b 100644 --- a/view/js/icon_translate.js +++ b/view/js/icon_translate.js @@ -52,4 +52,5 @@ $(document).ready(function() { $('.icon-circle-blank').addClass(''); $('.icon-circle').addClass(''); $('.icon-bookmark').addClass(''); + $('.icon-fullscreen').addClass(''); });
\ No newline at end of file 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/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/chanview.tpl b/view/tpl/chanview.tpl index 4df327bf9..a43ea1b5d 100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1,2 +1,2 @@ -<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >☐</div> +<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div> <iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> 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/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">▼</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="" 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="" 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 f5f2206bc..49dff4822 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -127,4 +127,23 @@ <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> + +{{if $menus}} +<h3 class="settings-heading">{{$lbl_misc}}</h3> + +<div id="settings-menu-desc">{{$menu_desc}}</div> +<div class="settings-channel-menu-div"> +<select name="channel_menu" class="settings-channel-menu-sel"> +{{foreach $menus as $menu }} +<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> +{{/foreach}} +</select> +</div> +<div class="settings-submit-wrapper" > +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> +</div> +<div id="settings-channel-menu-end"></div> +{{/if}} + + </div> |