diff options
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | doc/Widgets.md | 7 | ||||
| -rw-r--r-- | include/identity.php | 7 | ||||
| -rw-r--r-- | include/widgets.php | 20 | ||||
| -rw-r--r-- | mod/_well_known.php | 16 | ||||
| -rw-r--r-- | util/hmessages.po | 1053 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/main.js | 45 |
8 files changed, 598 insertions, 555 deletions
@@ -863,7 +863,7 @@ class App { && array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) { $url = $this->config['system']['baseurl']; - + $url = trim($url,'\\/'); return $url; } @@ -881,6 +881,7 @@ class App { && array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) { $url = $this->config['system']['baseurl']; + $url = trim($url,'\\/'); } $parsed = @parse_url($url); diff --git a/doc/Widgets.md b/doc/Widgets.md index 10fc75cf8..8442bf687 100644 --- a/doc/Widgets.md +++ b/doc/Widgets.md @@ -74,8 +74,11 @@ Some/many of these widgets have restrictions which may restrict the type of page * suggestedchats - "interesting" chatrooms chosen for the current observer -* item - displays a single webpage item by mid - * args: mid - message_id of webpage to display (must be webpage, not a conversation item) +* item - displays a single webpage item by mid or page title + * args: + * channel_id - channel that owns the content, defualt is the profile_uid + * mid - message_id of webpage to display (must be webpage, not a conversation item) + * title - URL page title of webpage (must provide one of either title or mid) <br /> <br /> * photo - display a single photo diff --git a/include/identity.php b/include/identity.php index fd0b4d7f5..e1e79394a 100644 --- a/include/identity.php +++ b/include/identity.php @@ -924,6 +924,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $pdesc = true; $reddress = true; + if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) { + $block = true; + } + if($block && intval(get_config('system','block_public_blackout'))) return $o; @@ -1012,9 +1016,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { // logger('online: ' . $profile['online']); - if(! perm_is_allowed($profile['uid'],((is_array($observer)) ? $observer['xchan_hash'] : ''),'view_profile')) { - $block = true; - } if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { $location = $reddress = $pdesc = $gender = $marital = $homepage = False; diff --git a/include/widgets.php b/include/widgets.php index 891e9c018..7e502e4c2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -817,7 +817,7 @@ function widget_item($arr) { return ''; - if(! $arr['mid']) + if((! $arr['mid']) && (! $arr['title'])) return ''; if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages')) @@ -826,10 +826,20 @@ function widget_item($arr) { require_once('include/security.php'); $sql_extra = item_permissions_sql($channel_id); - $r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1", - dbesc($arr['mid']), - intval($channel_id) - ); + if($arr['title']) { + $r = q("select item.* from item left join item_id on item.id = item_id.iid + where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", + intval($channel_id), + dbesc($arr['title']), + intval(ITEM_TYPE_WEBPAGE) + ); + } + else { + $r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1", + dbesc($arr['mid']), + intval($channel_id) + ); + } if(! $r) return ''; diff --git a/mod/_well_known.php b/mod/_well_known.php index 58ed13ece..47cfe1512 100644 --- a/mod/_well_known.php +++ b/mod/_well_known.php @@ -7,6 +7,22 @@ function _well_known_init(&$a){ $arr = array('server' => $_SERVER, 'request' => $_REQUEST);
call_hooks('well_known', $arr);
+
+ if(! check_siteallowed($_SERVER['REMOTE_ADDR'])) {
+ logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
+ killme();
+ }
+
+ // from php.net re: REMOTE_HOST:
+ // Note: Your web server must be configured to create this variable. For example in Apache
+ // you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr().
+
+ if(get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) {
+ logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
+ killme();
+ }
+
+
switch(argv(1)) {
case 'zot-info':
$a->argc -= 1;
diff --git a/util/hmessages.po b/util/hmessages.po index f4ca7b494..e1a35325e 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-01-26.1290H\n" +"Project-Id-Version: 2016-01-29.1293H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-26 23:37-0800\n" +"POT-Creation-Date: 2016-01-29 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../include/Contact.php:101 ../../include/conversation.php:961 -#: ../../include/identity.php:949 ../../include/widgets.php:137 +#: ../../include/identity.php:953 ../../include/widgets.php:137 #: ../../include/widgets.php:175 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" @@ -127,8 +127,8 @@ msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/conversation.php:1731 -#: ../../include/taxonomy.php:414 ../../include/identity.php:1262 -#: ../../mod/photos.php:1083 +#: ../../include/taxonomy.php:414 ../../include/identity.php:1266 +#: ../../mod/photos.php:1083 ../../mod/zcard.php:56 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -400,7 +400,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360 #: ../../include/apps.php:415 ../../include/conversation.php:1037 -#: ../../include/widgets.php:1376 ../../mod/photos.php:754 +#: ../../include/widgets.php:1386 ../../mod/photos.php:754 #: ../../mod/photos.php:1195 msgid "Unknown" msgstr "" @@ -428,7 +428,7 @@ msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:231 -#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1389 +#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1399 #: ../../mod/photos.php:781 ../../mod/photos.php:1316 #: ../../mod/profile_photo.php:453 ../../mod/cover_photo.php:353 msgid "Upload" @@ -614,7 +614,7 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1517 +#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1518 msgid "Login" msgstr "" @@ -642,8 +642,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:138 ../../include/identity.php:1236 -#: ../../include/identity.php:1353 ../../mod/profperm.php:112 +#: ../../include/apps.php:138 ../../include/identity.php:1240 +#: ../../include/identity.php:1357 ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -703,7 +703,7 @@ msgstr "" msgid "Invite" msgstr "" -#: ../../include/apps.php:152 ../../include/widgets.php:1262 +#: ../../include/apps.php:152 ../../include/widgets.php:1272 msgid "Features" msgstr "" @@ -876,7 +876,7 @@ msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/identity.php:1000 ../../include/text.php:1425 +#: ../../include/identity.php:1004 ../../include/text.php:1425 #: ../../mod/directory.php:307 msgid "Location:" msgstr "" @@ -1022,8 +1022,8 @@ msgstr "" msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/contact_widgets.php:57 ../../include/features.php:93 -#: ../../include/widgets.php:304 +#: ../../include/contact_widgets.php:57 ../../include/widgets.php:304 +#: ../../include/features.php:93 msgid "Saved Folders" msgstr "" @@ -1570,7 +1570,7 @@ msgstr "" msgid "Required" msgstr "" -#: ../../include/datetime.php:263 ../../boot.php:2347 +#: ../../include/datetime.php:263 ../../boot.php:2348 msgid "never" msgstr "" @@ -1672,7 +1672,7 @@ msgstr "" #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 #: ../../mod/photos.php:626 ../../mod/removeme.php:60 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522 msgid "No" msgstr "" @@ -1684,7 +1684,7 @@ msgstr "" #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 #: ../../mod/photos.php:626 ../../mod/removeme.php:60 #: ../../mod/settings.php:577 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1521 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1522 msgid "Yes" msgstr "" @@ -2146,7 +2146,7 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1516 +#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1517 msgid "Logout" msgstr "" @@ -2174,7 +2174,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/identity.php:972 +#: ../../include/nav.php:90 ../../include/identity.php:976 msgid "Edit Profile" msgstr "" @@ -2223,7 +2223,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1499 +#: ../../include/nav.php:149 ../../mod/register.php:264 ../../boot.php:1500 msgid "Register" msgstr "" @@ -2333,7 +2333,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:210 ../../include/widgets.php:1289 +#: ../../include/nav.php:210 ../../include/widgets.php:1299 msgid "Admin" msgstr "" @@ -2927,7 +2927,7 @@ msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:891 #: ../../mod/admin.php:900 ../../mod/id.php:15 ../../mod/id.php:16 -#: ../../boot.php:1519 +#: ../../boot.php:1520 msgid "Email" msgstr "" @@ -2955,280 +2955,6 @@ msgstr "" msgid "MySpace" msgstr "" -#: ../../include/features.php:45 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:47 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:47 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "" - -#: ../../include/features.php:48 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:48 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:49 -msgid "Advanced Profiles" -msgstr "" - -#: ../../include/features.php:49 -msgid "Additional profile sections and selections" -msgstr "" - -#: ../../include/features.php:50 -msgid "Profile Import/Export" -msgstr "" - -#: ../../include/features.php:50 -msgid "Save and load profile details across sites/channels" -msgstr "" - -#: ../../include/features.php:51 -msgid "Web Pages" -msgstr "" - -#: ../../include/features.php:51 -msgid "Provide managed web pages on your channel" -msgstr "" - -#: ../../include/features.php:52 -msgid "Hide Rating" -msgstr "" - -#: ../../include/features.php:52 -msgid "" -"Hide the rating buttons on your channel and profile pages. Note: People can " -"still rate you somewhere else." -msgstr "" - -#: ../../include/features.php:53 -msgid "Private Notes" -msgstr "" - -#: ../../include/features.php:53 -msgid "Enables a tool to store notes and reminders" -msgstr "" - -#: ../../include/features.php:54 -msgid "Navigation Channel Select" -msgstr "" - -#: ../../include/features.php:54 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "" - -#: ../../include/features.php:55 -msgid "Photo Location" -msgstr "" - -#: ../../include/features.php:55 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: ../../include/features.php:57 -msgid "Expert Mode" -msgstr "" - -#: ../../include/features.php:57 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "" - -#: ../../include/features.php:58 -msgid "Premium Channel" -msgstr "" - -#: ../../include/features.php:58 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../include/features.php:63 -msgid "Post Composition Features" -msgstr "" - -#: ../../include/features.php:65 -msgid "Use Markdown" -msgstr "" - -#: ../../include/features.php:65 -msgid "Allow use of \"Markdown\" to format posts" -msgstr "" - -#: ../../include/features.php:66 -msgid "Large Photos" -msgstr "" - -#: ../../include/features.php:66 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" -msgstr "" - -#: ../../include/features.php:67 ../../include/widgets.php:549 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "" - -#: ../../include/features.php:67 -msgid "Automatically import channel content from other channels or feeds" -msgstr "" - -#: ../../include/features.php:68 -msgid "Even More Encryption" -msgstr "" - -#: ../../include/features.php:68 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "" - -#: ../../include/features.php:69 -msgid "Enable Voting Tools" -msgstr "" - -#: ../../include/features.php:69 -msgid "Provide a class of post which others can vote on" -msgstr "" - -#: ../../include/features.php:70 -msgid "Delayed Posting" -msgstr "" - -#: ../../include/features.php:70 -msgid "Allow posts to be published at a later date" -msgstr "" - -#: ../../include/features.php:71 -msgid "Suppress Duplicate Posts/Comments" -msgstr "" - -#: ../../include/features.php:71 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." -msgstr "" - -#: ../../include/features.php:77 -msgid "Network and Stream Filtering" -msgstr "" - -#: ../../include/features.php:78 -msgid "Search by Date" -msgstr "" - -#: ../../include/features.php:78 -msgid "Ability to select posts by date ranges" -msgstr "" - -#: ../../include/features.php:79 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:80 ../../include/widgets.php:274 -msgid "Saved Searches" -msgstr "" - -#: ../../include/features.php:80 -msgid "Save search terms for re-use" -msgstr "" - -#: ../../include/features.php:81 -msgid "Network Personal Tab" -msgstr "" - -#: ../../include/features.php:81 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "" - -#: ../../include/features.php:82 -msgid "Network New Tab" -msgstr "" - -#: ../../include/features.php:82 -msgid "Enable tab to display all new Network activity" -msgstr "" - -#: ../../include/features.php:83 -msgid "Affinity Tool" -msgstr "" - -#: ../../include/features.php:83 -msgid "Filter stream activity by depth of relationships" -msgstr "" - -#: ../../include/features.php:84 -msgid "Connection Filtering" -msgstr "" - -#: ../../include/features.php:84 -msgid "Filter incoming posts from connections based on keywords/content" -msgstr "" - -#: ../../include/features.php:85 -msgid "Suggest Channels" -msgstr "" - -#: ../../include/features.php:85 -msgid "Show channel suggestions" -msgstr "" - -#: ../../include/features.php:90 -msgid "Post/Comment Tools" -msgstr "" - -#: ../../include/features.php:91 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:91 -msgid "Ability to tag existing posts" -msgstr "" - -#: ../../include/features.php:92 -msgid "Post Categories" -msgstr "" - -#: ../../include/features.php:92 -msgid "Add categories to your posts" -msgstr "" - -#: ../../include/features.php:93 -msgid "Ability to file posts under folders" -msgstr "" - -#: ../../include/features.php:94 -msgid "Dislike Posts" -msgstr "" - -#: ../../include/features.php:94 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: ../../include/features.php:95 -msgid "Star Posts" -msgstr "" - -#: ../../include/features.php:95 -msgid "Ability to mark special posts with a star indicator" -msgstr "" - -#: ../../include/features.php:96 -msgid "Tag Cloud" -msgstr "" - -#: ../../include/features.php:96 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" - #: ../../include/identity.php:32 msgid "Unable to obtain identity information from database" msgstr "" @@ -3278,192 +3004,192 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:962 ../../mod/profiles.php:782 +#: ../../include/identity.php:966 ../../mod/profiles.php:782 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:968 +#: ../../include/identity.php:972 msgid "Profiles" msgstr "" -#: ../../include/identity.php:968 +#: ../../include/identity.php:972 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:969 ../../mod/profiles.php:783 +#: ../../include/identity.php:973 ../../mod/profiles.php:783 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:984 ../../mod/profiles.php:794 +#: ../../include/identity.php:988 ../../mod/profiles.php:794 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:987 +#: ../../include/identity.php:991 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:988 ../../mod/profiles.php:677 +#: ../../include/identity.php:992 ../../mod/profiles.php:677 #: ../../mod/profiles.php:798 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:1004 ../../include/identity.php:1246 +#: ../../include/identity.php:1008 ../../include/identity.php:1250 msgid "Gender:" msgstr "" -#: ../../include/identity.php:1005 ../../include/identity.php:1290 +#: ../../include/identity.php:1009 ../../include/identity.php:1294 msgid "Status:" msgstr "" -#: ../../include/identity.php:1006 ../../include/identity.php:1301 +#: ../../include/identity.php:1010 ../../include/identity.php:1305 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:1007 +#: ../../include/identity.php:1011 msgid "Online Now" msgstr "" -#: ../../include/identity.php:1093 ../../include/identity.php:1171 +#: ../../include/identity.php:1097 ../../include/identity.php:1175 #: ../../mod/ping.php:318 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:1094 ../../include/identity.php:1172 +#: ../../include/identity.php:1098 ../../include/identity.php:1176 msgid "F d" msgstr "" -#: ../../include/identity.php:1139 ../../include/identity.php:1211 +#: ../../include/identity.php:1143 ../../include/identity.php:1215 #: ../../mod/ping.php:341 msgid "[today]" msgstr "" -#: ../../include/identity.php:1150 +#: ../../include/identity.php:1154 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1155 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1204 +#: ../../include/identity.php:1208 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1222 +#: ../../include/identity.php:1226 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1223 +#: ../../include/identity.php:1227 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1244 ../../mod/settings.php:1030 +#: ../../include/identity.php:1248 ../../mod/settings.php:1030 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1251 +#: ../../include/identity.php:1255 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1275 +#: ../../include/identity.php:1279 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1276 +#: ../../include/identity.php:1280 msgid "j F" msgstr "" -#: ../../include/identity.php:1283 +#: ../../include/identity.php:1287 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1287 ../../mod/directory.php:302 +#: ../../include/identity.php:1291 ../../mod/directory.php:302 msgid "Age:" msgstr "" -#: ../../include/identity.php:1296 +#: ../../include/identity.php:1300 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1299 ../../mod/profiles.php:699 +#: ../../include/identity.php:1303 ../../mod/profiles.php:699 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1303 ../../mod/directory.php:318 +#: ../../include/identity.php:1307 ../../mod/directory.php:318 #: ../../mod/profiles.php:701 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1305 +#: ../../include/identity.php:1309 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1307 ../../mod/profiles.php:702 +#: ../../include/identity.php:1311 ../../mod/profiles.php:702 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1309 +#: ../../include/identity.php:1313 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1311 ../../mod/directory.php:320 +#: ../../include/identity.php:1315 ../../mod/directory.php:320 msgid "About:" msgstr "" -#: ../../include/identity.php:1313 +#: ../../include/identity.php:1317 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1315 ../../mod/profiles.php:705 +#: ../../include/identity.php:1319 ../../mod/profiles.php:705 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1317 ../../mod/profiles.php:706 +#: ../../include/identity.php:1321 ../../mod/profiles.php:706 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1319 +#: ../../include/identity.php:1323 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1321 +#: ../../include/identity.php:1325 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1323 +#: ../../include/identity.php:1327 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1325 +#: ../../include/identity.php:1329 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1327 +#: ../../include/identity.php:1331 msgid "Television:" msgstr "" -#: ../../include/identity.php:1329 +#: ../../include/identity.php:1333 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1331 +#: ../../include/identity.php:1335 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1333 +#: ../../include/identity.php:1337 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1335 +#: ../../include/identity.php:1339 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1355 +#: ../../include/identity.php:1359 msgid "Like this thing" msgstr "" -#: ../../include/identity.php:1763 ../../mod/cover_photo.php:236 +#: ../../include/identity.php:1767 ../../mod/cover_photo.php:236 msgid "cover photo" msgstr "" @@ -3707,6 +3433,257 @@ msgstr "" msgid "Pages" msgstr "" +#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6 +#: ../../mod/dreport.php:45 ../../mod/group.php:68 +#: ../../mod/import_items.php:108 ../../mod/like.php:280 +#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 +msgid "Permission denied" +msgstr "" + +#: ../../include/items.php:1130 ../../include/items.php:1176 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1373 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1375 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1377 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1379 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1381 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1383 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1385 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1387 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4350 ../../mod/admin.php:135 +#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36 +#: ../../mod/filestorage.php:27 ../../mod/thing.php:85 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "" + +#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137 +msgid "Privacy group not found." +msgstr "" + +#: ../../include/items.php:4878 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:4885 +#, php-format +msgid "Privacy group: %s" +msgstr "" + +#: ../../include/items.php:4895 ../../mod/connedit.php:692 +#, php-format +msgid "Connection: %s" +msgstr "" + +#: ../../include/items.php:4897 +msgid "Connection not found." +msgstr "" + +#: ../../include/enotify.php:96 +#, php-format +msgid "%s <!item_type!>" +msgstr "" + +#: ../../include/enotify.php:100 +#, php-format +msgid "[Hubzilla:Notify] New mail received at %s" +msgstr "" + +#: ../../include/enotify.php:102 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "" + +#: ../../include/enotify.php:103 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "" + +#: ../../include/enotify.php:103 +msgid "a private message" +msgstr "" + +#: ../../include/enotify.php:104 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "" + +#: ../../include/enotify.php:160 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:168 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:177 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:188 +#, php-format +msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" +msgstr "" + +#: ../../include/enotify.php:189 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." +msgstr "" + +#: ../../include/enotify.php:192 ../../include/enotify.php:207 +#: ../../include/enotify.php:233 ../../include/enotify.php:251 +#: ../../include/enotify.php:265 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." +msgstr "" + +#: ../../include/enotify.php:198 +#, php-format +msgid "[Hubzilla:Notify] %s posted to your profile wall" +msgstr "" + +#: ../../include/enotify.php:200 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgstr "" + +#: ../../include/enotify.php:202 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgstr "" + +#: ../../include/enotify.php:226 +#, php-format +msgid "[Hubzilla:Notify] %s tagged you" +msgstr "" + +#: ../../include/enotify.php:227 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "" + +#: ../../include/enotify.php:228 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:240 +#, php-format +msgid "[Hubzilla:Notify] %1$s poked you" +msgstr "" + +#: ../../include/enotify.php:241 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "" + +#: ../../include/enotify.php:242 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:258 +#, php-format +msgid "[Hubzilla:Notify] %s tagged your post" +msgstr "" + +#: ../../include/enotify.php:259 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "" + +#: ../../include/enotify.php:260 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "" + +#: ../../include/enotify.php:272 +msgid "[Hubzilla:Notify] Introduction received" +msgstr "" + +#: ../../include/enotify.php:273 +#, php-format +msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:274 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgstr "" + +#: ../../include/enotify.php:278 ../../include/enotify.php:297 +#, php-format +msgid "You may visit their profile at %s" +msgstr "" + +#: ../../include/enotify.php:280 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "" + +#: ../../include/enotify.php:287 +msgid "[Hubzilla:Notify] Friend suggestion received" +msgstr "" + +#: ../../include/enotify.php:288 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:289 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgstr "" + +#: ../../include/enotify.php:295 +msgid "Name:" +msgstr "" + +#: ../../include/enotify.php:296 +msgid "Photo:" +msgstr "" + +#: ../../include/enotify.php:299 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "" + +#: ../../include/enotify.php:514 +msgid "[Hubzilla:Notify]" +msgstr "" + #: ../../include/widgets.php:93 msgid "System" msgstr "" @@ -3756,6 +3733,10 @@ msgstr "" msgid "Remove term" msgstr "" +#: ../../include/widgets.php:274 ../../include/features.php:80 +msgid "Saved Searches" +msgstr "" + #: ../../include/widgets.php:349 msgid "Archives" msgstr "" @@ -3817,6 +3798,11 @@ msgstr "" msgid "Premium Channel Settings" msgstr "" +#: ../../include/widgets.php:549 ../../include/features.php:67 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "" + #: ../../include/widgets.php:571 msgid "Private Mail Menu" msgstr "" @@ -3893,359 +3879,373 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" -#: ../../include/widgets.php:939 ../../include/widgets.php:1029 +#: ../../include/widgets.php:949 ../../include/widgets.php:1039 msgid "photo/image" msgstr "" -#: ../../include/widgets.php:1123 +#: ../../include/widgets.php:1133 msgid "Rating Tools" msgstr "" -#: ../../include/widgets.php:1127 ../../include/widgets.php:1129 +#: ../../include/widgets.php:1137 ../../include/widgets.php:1139 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:1132 +#: ../../include/widgets.php:1142 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:1143 +#: ../../include/widgets.php:1153 msgid "Public Hubs" msgstr "" -#: ../../include/widgets.php:1191 +#: ../../include/widgets.php:1201 msgid "Forums" msgstr "" -#: ../../include/widgets.php:1220 +#: ../../include/widgets.php:1230 msgid "Tasks" msgstr "" -#: ../../include/widgets.php:1229 +#: ../../include/widgets.php:1239 msgid "Documentation" msgstr "" -#: ../../include/widgets.php:1231 +#: ../../include/widgets.php:1241 msgid "Project/Site Information" msgstr "" -#: ../../include/widgets.php:1232 +#: ../../include/widgets.php:1242 msgid "For Members" msgstr "" -#: ../../include/widgets.php:1233 +#: ../../include/widgets.php:1243 msgid "For Administrators" msgstr "" -#: ../../include/widgets.php:1234 +#: ../../include/widgets.php:1244 msgid "For Developers" msgstr "" -#: ../../include/widgets.php:1259 ../../mod/admin.php:452 +#: ../../include/widgets.php:1269 ../../mod/admin.php:452 msgid "Site" msgstr "" -#: ../../include/widgets.php:1260 +#: ../../include/widgets.php:1270 msgid "Accounts" msgstr "" -#: ../../include/widgets.php:1261 ../../mod/admin.php:1051 +#: ../../include/widgets.php:1271 ../../mod/admin.php:1051 msgid "Channels" msgstr "" -#: ../../include/widgets.php:1263 ../../mod/admin.php:1166 +#: ../../include/widgets.php:1273 ../../mod/admin.php:1166 #: ../../mod/admin.php:1227 msgid "Plugins" msgstr "" -#: ../../include/widgets.php:1264 ../../mod/admin.php:1388 +#: ../../include/widgets.php:1274 ../../mod/admin.php:1388 #: ../../mod/admin.php:1422 msgid "Themes" msgstr "" -#: ../../include/widgets.php:1265 +#: ../../include/widgets.php:1275 msgid "Inspect queue" msgstr "" -#: ../../include/widgets.php:1266 +#: ../../include/widgets.php:1276 msgid "Profile Config" msgstr "" -#: ../../include/widgets.php:1267 +#: ../../include/widgets.php:1277 msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1285 ../../include/widgets.php:1291 +#: ../../include/widgets.php:1295 ../../include/widgets.php:1301 #: ../../mod/admin.php:1507 msgid "Logs" msgstr "" -#: ../../include/widgets.php:1290 +#: ../../include/widgets.php:1300 msgid "Plugin Features" msgstr "" -#: ../../include/widgets.php:1292 +#: ../../include/widgets.php:1302 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../include/widgets.php:1370 ../../mod/photos.php:748 +#: ../../include/widgets.php:1380 ../../mod/photos.php:748 #: ../../mod/photos.php:1283 msgid "View Photo" msgstr "" -#: ../../include/widgets.php:1387 ../../mod/photos.php:779 +#: ../../include/widgets.php:1397 ../../mod/photos.php:779 msgid "Edit Album" msgstr "" -#: ../../include/items.php:423 ../../index.php:370 ../../mod/dreport.php:6 -#: ../../mod/dreport.php:45 ../../mod/group.php:68 -#: ../../mod/import_items.php:108 ../../mod/like.php:280 -#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 -msgid "Permission denied" +#: ../../include/features.php:45 +msgid "General Features" msgstr "" -#: ../../include/items.php:1130 ../../include/items.php:1176 -msgid "(Unknown)" +#: ../../include/features.php:47 +msgid "Content Expiration" msgstr "" -#: ../../include/items.php:1373 -msgid "Visible to anybody on the internet." +#: ../../include/features.php:47 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/items.php:1375 -msgid "Visible to you only." +#: ../../include/features.php:48 +msgid "Multiple Profiles" msgstr "" -#: ../../include/items.php:1377 -msgid "Visible to anybody in this network." +#: ../../include/features.php:48 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/items.php:1379 -msgid "Visible to anybody authenticated." +#: ../../include/features.php:49 +msgid "Advanced Profiles" msgstr "" -#: ../../include/items.php:1381 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/features.php:49 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/items.php:1383 -msgid "Visible to all connections." +#: ../../include/features.php:50 +msgid "Profile Import/Export" msgstr "" -#: ../../include/items.php:1385 -msgid "Visible to approved connections." +#: ../../include/features.php:50 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/items.php:1387 -msgid "Visible to specific connections." +#: ../../include/features.php:51 +msgid "Web Pages" msgstr "" -#: ../../include/items.php:4350 ../../mod/admin.php:135 -#: ../../mod/admin.php:1091 ../../mod/admin.php:1336 ../../mod/display.php:36 -#: ../../mod/filestorage.php:27 ../../mod/thing.php:85 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." +#: ../../include/features.php:51 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/items.php:4862 ../../mod/group.php:38 ../../mod/group.php:137 -msgid "Privacy group not found." +#: ../../include/features.php:52 +msgid "Hide Rating" msgstr "" -#: ../../include/items.php:4878 -msgid "Privacy group is empty." +#: ../../include/features.php:52 +msgid "" +"Hide the rating buttons on your channel and profile pages. Note: People can " +"still rate you somewhere else." msgstr "" -#: ../../include/items.php:4885 -#, php-format -msgid "Privacy group: %s" +#: ../../include/features.php:53 +msgid "Private Notes" msgstr "" -#: ../../include/items.php:4895 ../../mod/connedit.php:692 -#, php-format -msgid "Connection: %s" +#: ../../include/features.php:53 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/items.php:4897 -msgid "Connection not found." +#: ../../include/features.php:54 +msgid "Navigation Channel Select" msgstr "" -#: ../../include/enotify.php:96 -#, php-format -msgid "%s <!item_type!>" +#: ../../include/features.php:54 +msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/enotify.php:100 -#, php-format -msgid "[Hubzilla:Notify] New mail received at %s" +#: ../../include/features.php:55 +msgid "Photo Location" msgstr "" -#: ../../include/enotify.php:102 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." +#: ../../include/features.php:55 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/enotify.php:103 -#, php-format -msgid "%1$s sent you %2$s." +#: ../../include/features.php:57 +msgid "Expert Mode" msgstr "" -#: ../../include/enotify.php:103 -msgid "a private message" +#: ../../include/features.php:57 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/enotify.php:104 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." +#: ../../include/features.php:58 +msgid "Premium Channel" msgstr "" -#: ../../include/enotify.php:160 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +#: ../../include/features.php:58 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/enotify.php:168 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +#: ../../include/features.php:63 +msgid "Post Composition Features" msgstr "" -#: ../../include/enotify.php:177 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +#: ../../include/features.php:65 +msgid "Use Markdown" msgstr "" -#: ../../include/enotify.php:188 -#, php-format -msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" +#: ../../include/features.php:65 +msgid "Allow use of \"Markdown\" to format posts" msgstr "" -#: ../../include/enotify.php:189 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." +#: ../../include/features.php:66 +msgid "Large Photos" msgstr "" -#: ../../include/enotify.php:192 ../../include/enotify.php:207 -#: ../../include/enotify.php:233 ../../include/enotify.php:251 -#: ../../include/enotify.php:265 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." +#: ../../include/features.php:66 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" msgstr "" -#: ../../include/enotify.php:198 -#, php-format -msgid "[Hubzilla:Notify] %s posted to your profile wall" +#: ../../include/features.php:67 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/enotify.php:200 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" +#: ../../include/features.php:68 +msgid "Even More Encryption" msgstr "" -#: ../../include/enotify.php:202 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +#: ../../include/features.php:68 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/enotify.php:226 -#, php-format -msgid "[Hubzilla:Notify] %s tagged you" +#: ../../include/features.php:69 +msgid "Enable Voting Tools" msgstr "" -#: ../../include/enotify.php:227 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../include/features.php:69 +msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/enotify.php:228 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +#: ../../include/features.php:70 +msgid "Delayed Posting" msgstr "" -#: ../../include/enotify.php:240 -#, php-format -msgid "[Hubzilla:Notify] %1$s poked you" +#: ../../include/features.php:70 +msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/enotify.php:241 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../include/features.php:71 +msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/enotify.php:242 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +#: ../../include/features.php:71 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." msgstr "" -#: ../../include/enotify.php:258 -#, php-format -msgid "[Hubzilla:Notify] %s tagged your post" +#: ../../include/features.php:77 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/enotify.php:259 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +#: ../../include/features.php:78 +msgid "Search by Date" msgstr "" -#: ../../include/enotify.php:260 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +#: ../../include/features.php:78 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/enotify.php:272 -msgid "[Hubzilla:Notify] Introduction received" +#: ../../include/features.php:79 +msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/enotify.php:273 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +#: ../../include/features.php:80 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/enotify.php:274 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +#: ../../include/features.php:81 +msgid "Network Personal Tab" msgstr "" -#: ../../include/enotify.php:278 ../../include/enotify.php:297 -#, php-format -msgid "You may visit their profile at %s" +#: ../../include/features.php:81 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/enotify.php:280 -#, php-format -msgid "Please visit %s to approve or reject the connection request." +#: ../../include/features.php:82 +msgid "Network New Tab" msgstr "" -#: ../../include/enotify.php:287 -msgid "[Hubzilla:Notify] Friend suggestion received" +#: ../../include/features.php:82 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/enotify.php:288 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +#: ../../include/features.php:83 +msgid "Affinity Tool" msgstr "" -#: ../../include/enotify.php:289 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +#: ../../include/features.php:83 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/enotify.php:295 -msgid "Name:" +#: ../../include/features.php:84 +msgid "Connection Filtering" msgstr "" -#: ../../include/enotify.php:296 -msgid "Photo:" +#: ../../include/features.php:84 +msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/enotify.php:299 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../include/features.php:85 +msgid "Suggest Channels" msgstr "" -#: ../../include/enotify.php:514 -msgid "[Hubzilla:Notify]" +#: ../../include/features.php:85 +msgid "Show channel suggestions" +msgstr "" + +#: ../../include/features.php:90 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:91 +msgid "Community Tagging" +msgstr "" + +#: ../../include/features.php:91 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:92 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:92 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:93 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:94 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:94 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:95 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:95 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + +#: ../../include/features.php:96 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:96 +msgid "Provide a personal tag cloud on your channel page" msgstr "" #: ../../index.php:242 ../../mod/help.php:213 @@ -5149,6 +5149,7 @@ msgid "Invalid item." msgstr "" #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29 +#: ../../mod/zcard.php:19 msgid "Channel not found." msgstr "" @@ -8902,7 +8903,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:86 ../../boot.php:1525 +#: ../../mod/lostpass.php:86 ../../boot.php:1526 msgid "Password Reset" msgstr "" @@ -9404,51 +9405,51 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1328 +#: ../../boot.php:1329 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1331 +#: ../../boot.php:1332 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1498 +#: ../../boot.php:1499 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1520 +#: ../../boot.php:1521 msgid "Password" msgstr "" -#: ../../boot.php:1521 +#: ../../boot.php:1522 msgid "Remember me" msgstr "" -#: ../../boot.php:1524 +#: ../../boot.php:1525 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2154 +#: ../../boot.php:2155 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2306 +#: ../../boot.php:2307 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2309 +#: ../../boot.php:2310 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2346 +#: ../../boot.php:2347 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2350 +#: ../../boot.php:2351 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc index a9ccde1f5..1c457edcc 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-27.1291H +2016-01-29.1293H diff --git a/view/js/main.js b/view/js/main.js index d670b704a..16f6b9213 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -248,6 +248,7 @@ var updateCountsOnly = false; var divmore_height = 400; var last_filestorage_id = null; var mediaPlaying = false; +var contentHeightDiff = 0; $(function() { $.ajaxSetup({cache: false}); @@ -630,32 +631,40 @@ function updateConvItems(mode,data) { } else { collapseHeight(); } -} +} function collapseHeight() { + var origContentHeight = parseInt($("#region_2").height()); $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = $(this).outerHeight(true); - if(orgHeight > divmore_height + 10) { + var orgHeight = parseInt($(this).height()); + if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { - $(this).readmore({ - speed: 0, - heightMargin: 50, - collapsedHeight: divmore_height, - moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>', - lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>', - beforeToggle: function(trigger, element, expanded) { - if(expanded) { - if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { - $('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } ); + if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) { + $(this).readmore({ + speed: 0, + heightMargin: 50, + collapsedHeight: divmore_height, + moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>', + lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>', + beforeToggle: function(trigger, element, expanded) { + if(expanded) { + if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { + $('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } ); + } } } - } - }); - $(this).addClass('divmore'); + }); + $(this).addClass('divmore'); + } } } }); + + var collapsedContentHeight = parseInt($("#region_2").height()); + contentHeightDiff = origContentHeight - collapsedContentHeight; + + } function liveUpdate() { @@ -707,8 +716,10 @@ function liveUpdate() { $("#page-spinner").spin(false); $("#profile-jot-text-loading").spin(false); + console.log('contentHeightDiff: ' + contentHeightDiff); + if(update_mode === 'update') { - $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight); + $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff); } in_progress = false; |