diff options
| author | friendica <info@friendica.com> | 2013-10-18 14:25:55 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-18 14:25:55 -0700 |
| commit | 3772682204544e733baf910e6dfe35c0fe99e0e2 (patch) | |
| tree | 5ca11953a9ee07ff04457dff7011a58ce239f31c | |
| parent | 4a87ebfc1267b04a84b278089f4482018d067786 (diff) | |
| download | volse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.tar.gz volse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.tar.bz2 volse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.zip | |
Put a status editor on the display page if you're logged in. This fixes issue #113 and also provides the ability to reshare from that page.
| -rw-r--r-- | doc/html/dark_8php.html | 112 | ||||
| -rw-r--r-- | doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html | 112 | ||||
| -rw-r--r-- | doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js | 4 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | mod/display.php | 23 | ||||
| -rw-r--r-- | util/messages.po | 339 | ||||
| -rw-r--r-- | version.inc | 2 |
7 files changed, 442 insertions, 152 deletions
diff --git a/doc/html/dark_8php.html b/doc/html/dark_8php.html new file mode 100644 index 000000000..4499c7c2f --- /dev/null +++ b/doc/html/dark_8php.html @@ -0,0 +1,112 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> +<meta http-equiv="X-UA-Compatible" content="IE=9"/> +<meta name="generator" content="Doxygen 1.8.3.1"/> +<title>The Red Matrix: view/theme/redbasic/schema/dark.php File Reference</title> +<link href="tabs.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="jquery.js"></script> +<script type="text/javascript" src="dynsections.js"></script> +<link href="navtree.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="resize.js"></script> +<script type="text/javascript" src="navtree.js"></script> +<script type="text/javascript"> + $(document).ready(initResizable); + $(window).load(resizeHeight); +</script> +<link href="search/search.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="search/search.js"></script> +<script type="text/javascript"> + $(document).ready(function() { searchBox.OnSelectItem(0); }); +</script> +<link href="doxygen.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<div id="top"><!-- do not remove this div, it is closed by doxygen! --> +<div id="titlearea"> +<table cellspacing="0" cellpadding="0"> + <tbody> + <tr style="height: 56px;"> + <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td style="padding-left: 0.5em;"> + <div id="projectname">The Red Matrix + </div> + </td> + </tr> + </tbody> +</table> +</div> +<!-- end header part --> +<!-- Generated by Doxygen 1.8.3.1 --> +<script type="text/javascript"> +var searchBox = new SearchBox("searchBox", "search",false,'Search'); +</script> + <div id="navrow1" class="tabs"> + <ul class="tablist"> + <li><a href="index.html"><span>Main Page</span></a></li> + <li><a href="pages.html"><span>Related Pages</span></a></li> + <li><a href="namespaces.html"><span>Namespaces</span></a></li> + <li><a href="annotated.html"><span>Classes</span></a></li> + <li class="current"><a href="files.html"><span>Files</span></a></li> + <li> + <div id="MSearchBox" class="MSearchBoxInactive"> + <span class="left"> + <img id="MSearchSelect" src="search/mag_sel.png" + onmouseover="return searchBox.OnSearchSelectShow()" + onmouseout="return searchBox.OnSearchSelectHide()" + alt=""/> + <input type="text" id="MSearchField" value="Search" accesskey="S" + onfocus="searchBox.OnSearchFieldFocus(true)" + onblur="searchBox.OnSearchFieldFocus(false)" + onkeyup="searchBox.OnSearchFieldChange(event)"/> + </span><span class="right"> + <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a> + </span> + </div> + </li> + </ul> + </div> + <div id="navrow2" class="tabs2"> + <ul class="tablist"> + <li><a href="files.html"><span>File List</span></a></li> + <li><a href="globals.html"><span>File Members</span></a></li> + </ul> + </div> +</div><!-- top --> +<div id="side-nav" class="ui-resizable side-nav-resizable"> + <div id="nav-tree"> + <div id="nav-tree-contents"> + <div id="nav-sync" class="sync"></div> + </div> + </div> + <div id="splitbar" style="-moz-user-select:none;" + class="ui-resizable-handle"> + </div> +</div> +<script type="text/javascript"> +$(document).ready(function(){initNavTree('dark_8php.html','');}); +</script> +<div id="doc-content"> +<!-- window showing the filter options --> +<div id="MSearchSelectWindow" + onmouseover="return searchBox.OnSearchSelectShow()" + onmouseout="return searchBox.OnSearchSelectHide()" + onkeydown="return searchBox.OnSearchSelectKey(event)"> +<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark"> </span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark"> </span>Classes</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark"> </span>Namespaces</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark"> </span>Files</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark"> </span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark"> </span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark"> </span>Pages</a></div> + +<!-- iframe showing the search results (closed by default) --> +<div id="MSearchResultsWindow"> +<iframe src="javascript:void(0)" frameborder="0" + name="MSearchResults" id="MSearchResults"> +</iframe> +</div> + +<div class="header"> + <div class="headertitle"> +<div class="title">dark.php File Reference</div> </div> +</div><!--header--> +<div class="contents"> +</div><!-- contents --> +</div><!-- doc-content --> + diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html new file mode 100644 index 000000000..12217cad9 --- /dev/null +++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html @@ -0,0 +1,112 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> +<meta http-equiv="X-UA-Compatible" content="IE=9"/> +<meta name="generator" content="Doxygen 1.8.3.1"/> +<title>The Red Matrix: view/theme/redbasic/schema Directory Reference</title> +<link href="tabs.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="jquery.js"></script> +<script type="text/javascript" src="dynsections.js"></script> +<link href="navtree.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="resize.js"></script> +<script type="text/javascript" src="navtree.js"></script> +<script type="text/javascript"> + $(document).ready(initResizable); + $(window).load(resizeHeight); +</script> +<link href="search/search.css" rel="stylesheet" type="text/css"/> +<script type="text/javascript" src="search/search.js"></script> +<script type="text/javascript"> + $(document).ready(function() { searchBox.OnSelectItem(0); }); +</script> +<link href="doxygen.css" rel="stylesheet" type="text/css" /> +</head> +<body> +<div id="top"><!-- do not remove this div, it is closed by doxygen! --> +<div id="titlearea"> +<table cellspacing="0" cellpadding="0"> + <tbody> + <tr style="height: 56px;"> + <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td style="padding-left: 0.5em;"> + <div id="projectname">The Red Matrix + </div> + </td> + </tr> + </tbody> +</table> +</div> +<!-- end header part --> +<!-- Generated by Doxygen 1.8.3.1 --> +<script type="text/javascript"> +var searchBox = new SearchBox("searchBox", "search",false,'Search'); +</script> + <div id="navrow1" class="tabs"> + <ul class="tablist"> + <li><a href="index.html"><span>Main Page</span></a></li> + <li><a href="pages.html"><span>Related Pages</span></a></li> + <li><a href="namespaces.html"><span>Namespaces</span></a></li> + <li><a href="annotated.html"><span>Classes</span></a></li> + <li><a href="files.html"><span>Files</span></a></li> + <li> + <div id="MSearchBox" class="MSearchBoxInactive"> + <span class="left"> + <img id="MSearchSelect" src="search/mag_sel.png" + onmouseover="return searchBox.OnSearchSelectShow()" + onmouseout="return searchBox.OnSearchSelectHide()" + alt=""/> + <input type="text" id="MSearchField" value="Search" accesskey="S" + onfocus="searchBox.OnSearchFieldFocus(true)" + onblur="searchBox.OnSearchFieldFocus(false)" + onkeyup="searchBox.OnSearchFieldChange(event)"/> + </span><span class="right"> + <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a> + </span> + </div> + </li> + </ul> + </div> +</div><!-- top --> +<div id="side-nav" class="ui-resizable side-nav-resizable"> + <div id="nav-tree"> + <div id="nav-tree-contents"> + <div id="nav-sync" class="sync"></div> + </div> + </div> + <div id="splitbar" style="-moz-user-select:none;" + class="ui-resizable-handle"> + </div> +</div> +<script type="text/javascript"> +$(document).ready(function(){initNavTree('dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html','');}); +</script> +<div id="doc-content"> +<!-- window showing the filter options --> +<div id="MSearchSelectWindow" + onmouseover="return searchBox.OnSearchSelectShow()" + onmouseout="return searchBox.OnSearchSelectHide()" + onkeydown="return searchBox.OnSearchSelectKey(event)"> +<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark"> </span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark"> </span>Classes</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark"> </span>Namespaces</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark"> </span>Files</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark"> </span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark"> </span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark"> </span>Pages</a></div> + +<!-- iframe showing the search results (closed by default) --> +<div id="MSearchResultsWindow"> +<iframe src="javascript:void(0)" frameborder="0" + name="MSearchResults" id="MSearchResults"> +</iframe> +</div> + +<div class="header"> + <div class="headertitle"> +<div class="title">schema Directory Reference</div> </div> +</div><!--header--> +<div class="contents"> +<table class="memberdecls"> +<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a> +Files</h2></td></tr> +<tr class="memitem:dark_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="dark_8php.html">dark.php</a></td></tr> +<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> +</table> +</div><!-- contents --> +</div><!-- doc-content --> + diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js new file mode 100644 index 000000000..7889bb4f4 --- /dev/null +++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.js @@ -0,0 +1,4 @@ +var dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb = +[ + [ "dark.php", "dark_8php.html", null ] +];
\ No newline at end of file diff --git a/include/conversation.php b/include/conversation.php index 1820a8568..f9568c23f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1076,7 +1076,7 @@ function status_editor($a,$x,$popup=false) { call_hooks('jot_networks', $jotnets); $o .= replace_macros($tpl,array( - '$return_path' => $a->query_string, + '$return_path' => ((x($x,'return_path')) ? $x['return_path'] : $a->query_string), '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$webpage' => $webpage, diff --git a/mod/display.php b/mod/display.php index 41df5fca6..99cbd6f0e 100644 --- a/mod/display.php +++ b/mod/display.php @@ -35,6 +35,29 @@ function display_content(&$a, $update = 0, $load = false) { $observer_is_owner = false; + + if(local_user() && (! $update)) { + + $channel = $a->get_channel(); + + $x = array( + 'is_owner' => true, + 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), + 'default_location' => $channel['channel_location'], + 'nickname' => $channel['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + + 'acl' => populate_acl($channel, false), + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'return_path' => '/channel/' . $channel['channel_address'] + ); + + $o .= status_editor($a,$x); + + } + // This page can be viewed by anybody so the query could be complicated // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. // If that fails (or we aren't logged in locally), diff --git a/util/messages.po b/util/messages.po index c6acd1d7e..5e94d95d1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-10-11.463\n" +"Project-Id-Version: 2013-10-18.470\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-11 00:02-0700\n" +"POT-Creation-Date: 2013-10-18 00:02-0700\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" @@ -53,7 +53,7 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:970 +#: ../../include/api.php:972 msgid "Public Timeline" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: ../../include/ItemObject.php:244 ../../include/conversation.php:704 #: ../../include/conversation.php:1104 ../../mod/photos.php:1073 -#: ../../mod/message.php:303 ../../mod/message.php:466 +#: ../../mod/message.php:321 ../../mod/message.php:498 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 #: ../../mod/editpost.php:103 ../../mod/editblock.php:123 msgid "Please wait" @@ -380,8 +380,8 @@ msgstr "" #: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:693 #: ../../mod/photos.php:787 ../../mod/photos.php:1052 #: ../../mod/photos.php:1092 ../../mod/photos.php:1178 -#: ../../mod/message.php:304 ../../mod/message.php:465 -#: ../../mod/connections.php:428 ../../mod/profiles.php:529 +#: ../../mod/message.php:322 ../../mod/message.php:497 +#: ../../mod/connections.php:429 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 #: ../../view/theme/redbasic/php/config.php:64 @@ -429,7 +429,7 @@ msgid "Preview" msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 -#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:183 +#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:185 #: ../../boot.php:1716 msgid "Connect" msgstr "" @@ -639,6 +639,22 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" +#: ../../include/dir_fns.php:15 +msgid "Sort Options" +msgstr "" + +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" +msgstr "" + #: ../../include/event.php:11 ../../include/bb2diaspora.php:433 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -652,7 +668,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:158 ../../boot.php:1766 +#: ../../mod/events.php:450 ../../mod/directory.php:160 ../../boot.php:1766 msgid "Location:" msgstr "" @@ -1024,7 +1040,7 @@ msgstr "" msgid "Full Name:" msgstr "" -#: ../../include/profile_advanced.php:17 ../../mod/directory.php:160 +#: ../../include/profile_advanced.php:17 ../../mod/directory.php:162 #: ../../boot.php:1768 msgid "Gender:" msgstr "" @@ -1045,7 +1061,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../mod/directory.php:162 +#: ../../include/profile_advanced.php:37 ../../mod/directory.php:164 #: ../../boot.php:1769 msgid "Status:" msgstr "" @@ -1059,7 +1075,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/profile_advanced.php:48 ../../mod/directory.php:164 +#: ../../include/profile_advanced.php:48 ../../mod/directory.php:166 #: ../../boot.php:1770 msgid "Homepage:" msgstr "" @@ -1080,7 +1096,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/profile_advanced.php:58 ../../mod/directory.php:166 +#: ../../include/profile_advanced.php:58 ../../mod/directory.php:168 msgid "About:" msgstr "" @@ -1380,100 +1396,91 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:1062 ../../mod/message.php:405 +#: ../../include/text.php:1050 ../../mod/message.php:433 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1063 ../../mod/message.php:406 +#: ../../include/text.php:1051 ../../mod/message.php:434 msgid "bytes" msgstr "" -#: ../../include/text.php:1099 ../../include/text.php:1114 -#: ../../include/conversation.php:828 -msgid "remove" +#: ../../include/text.php:1086 +msgid "remove category" msgstr "" -#: ../../include/text.php:1099 ../../include/text.php:1114 -msgid "[remove]" +#: ../../include/text.php:1108 +msgid "remove from file" msgstr "" -#: ../../include/text.php:1102 ../../include/conversation.php:675 -msgid "Categories:" -msgstr "" - -#: ../../include/text.php:1117 ../../include/conversation.php:676 -msgid "Filed under:" -msgstr "" - -#: ../../include/text.php:1133 ../../include/text.php:1145 +#: ../../include/text.php:1162 ../../include/text.php:1174 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1316 ../../mod/events.php:326 +#: ../../include/text.php:1345 ../../mod/events.php:326 msgid "link to source" msgstr "" -#: ../../include/text.php:1335 +#: ../../include/text.php:1364 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1338 ../../include/text.php:1403 +#: ../../include/text.php:1367 ../../include/text.php:1432 msgid "default" msgstr "" -#: ../../include/text.php:1374 +#: ../../include/text.php:1403 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1415 +#: ../../include/text.php:1444 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1567 ../../include/conversation.php:117 +#: ../../include/text.php:1596 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1570 ../../include/conversation.php:120 +#: ../../include/text.php:1599 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1573 ../../include/conversation.php:145 +#: ../../include/text.php:1602 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1575 ../../include/conversation.php:147 +#: ../../include/text.php:1604 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1580 +#: ../../include/text.php:1609 msgid "activity" msgstr "" -#: ../../include/text.php:1842 +#: ../../include/text.php:1871 msgid "Design" msgstr "" -#: ../../include/text.php:1844 +#: ../../include/text.php:1873 msgid "Blocks" msgstr "" -#: ../../include/text.php:1845 +#: ../../include/text.php:1874 msgid "Menus" msgstr "" -#: ../../include/text.php:1846 +#: ../../include/text.php:1875 msgid "Layouts" msgstr "" -#: ../../include/text.php:1847 +#: ../../include/text.php:1876 msgid "Pages" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1141 +#: ../../include/identity.php:14 ../../mod/item.php:1126 msgid "Unable to obtain identity information from database" msgstr "" @@ -1550,7 +1557,7 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3523 +#: ../../include/attach.php:464 ../../include/items.php:3548 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 @@ -1571,7 +1578,7 @@ msgstr "" #: ../../mod/notifications.php:66 ../../mod/blocks.php:29 #: ../../mod/blocks.php:44 ../../mod/editpost.php:13 ../../mod/poke.php:128 #: ../../mod/channel.php:123 ../../mod/fsuggest.php:78 -#: ../../mod/editblock.php:48 ../../mod/item.php:174 ../../mod/item.php:182 +#: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 #: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 msgid "Permission denied." @@ -1954,7 +1961,7 @@ msgstr "" msgid "Search site content" msgstr "" -#: ../../include/nav.php:137 ../../mod/directory.php:210 +#: ../../include/nav.php:137 ../../mod/directory.php:212 msgid "Directory" msgstr "" @@ -1998,7 +2005,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:157 ../../mod/connections.php:561 +#: ../../include/nav.php:157 ../../mod/connections.php:562 msgid "New Connections" msgstr "" @@ -2083,7 +2090,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:181 ../../mod/connections.php:667 +#: ../../include/nav.php:181 ../../mod/connections.php:668 msgid "Connections" msgstr "" @@ -2228,8 +2235,8 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:673 -#: ../../mod/directory.php:206 ../../mod/directory.php:211 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:674 +#: ../../mod/directory.php:208 ../../mod/directory.php:213 msgid "Find" msgstr "" @@ -2459,10 +2466,22 @@ msgstr "" msgid "View %s's profile @ %s" msgstr "" +#: ../../include/conversation.php:675 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:676 +msgid "Filed under:" +msgstr "" + #: ../../include/conversation.php:702 msgid "View in context" msgstr "" +#: ../../include/conversation.php:828 +msgid "remove" +msgstr "" + #: ../../include/conversation.php:832 msgid "Loading..." msgstr "" @@ -2526,8 +2545,8 @@ msgstr "" msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1061 ../../mod/message.php:253 -#: ../../mod/message.php:370 +#: ../../include/conversation.php:1061 ../../mod/message.php:271 +#: ../../mod/message.php:398 msgid "Please enter a link URL:" msgstr "" @@ -2559,8 +2578,8 @@ msgstr "" msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1085 ../../mod/message.php:300 -#: ../../mod/message.php:462 ../../mod/editlayout.php:101 +#: ../../include/conversation.php:1085 ../../mod/message.php:318 +#: ../../mod/message.php:494 ../../mod/editlayout.php:101 #: ../../mod/editwebpage.php:120 ../../mod/editpost.php:95 #: ../../mod/editblock.php:115 msgid "Upload photo" @@ -2570,8 +2589,8 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1087 ../../mod/message.php:301 -#: ../../mod/message.php:463 ../../mod/editlayout.php:102 +#: ../../include/conversation.php:1087 ../../mod/message.php:319 +#: ../../mod/message.php:495 ../../mod/editlayout.php:102 #: ../../mod/editwebpage.php:121 ../../mod/editpost.php:96 #: ../../mod/editblock.php:116 msgid "Attach file" @@ -2581,8 +2600,8 @@ msgstr "" msgid "attach file" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/message.php:302 -#: ../../mod/message.php:464 ../../mod/editlayout.php:103 +#: ../../include/conversation.php:1089 ../../mod/message.php:320 +#: ../../mod/message.php:496 ../../mod/editlayout.php:103 #: ../../mod/editwebpage.php:122 ../../mod/editpost.php:97 #: ../../mod/editblock.php:117 msgid "Insert web link" @@ -2685,25 +2704,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3472 ../../mod/page.php:66 ../../mod/admin.php:150 +#: ../../include/items.php:3497 ../../mod/page.php:66 ../../mod/admin.php:150 #: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3644 +#: ../../include/items.php:3669 msgid "Archives" msgstr "" -#: ../../include/items.php:3805 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3830 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3821 ../../mod/network.php:469 +#: ../../include/items.php:3846 ../../mod/network.php:469 msgid "Group is empty" msgstr "" -#: ../../include/items.php:3837 +#: ../../include/items.php:3862 msgid "Connection not found." msgstr "" @@ -2870,8 +2889,8 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:297 -#: ../../mod/message.php:458 +#: ../../mod/invite.php:141 ../../mod/message.php:315 +#: ../../mod/message.php:490 msgid "Your message:" msgstr "" @@ -3786,7 +3805,7 @@ msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/photos.php:576 #: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18 -#: ../../mod/directory.php:23 +#: ../../mod/directory.php:25 msgid "Public access denied." msgstr "" @@ -4378,12 +4397,12 @@ msgid "Deny" msgstr "" #: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:325 ../../mod/connections.php:466 +#: ../../mod/connections.php:325 ../../mod/connections.php:467 msgid "Block" msgstr "" #: ../../mod/admin.php:679 ../../mod/connections.php:325 -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:467 msgid "Unblock" msgstr "" @@ -4827,7 +4846,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:528 +#: ../../mod/connections.php:529 msgid "New" msgstr "" @@ -4920,45 +4939,61 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:287 +#: ../../mod/message.php:248 +msgid "Message recalled." +msgstr "" + +#: ../../mod/message.php:305 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:288 ../../mod/message.php:453 +#: ../../mod/message.php:306 ../../mod/message.php:485 msgid "To:" msgstr "" -#: ../../mod/message.php:293 ../../mod/message.php:455 +#: ../../mod/message.php:311 ../../mod/message.php:487 msgid "Subject:" msgstr "" -#: ../../mod/message.php:322 +#: ../../mod/message.php:340 msgid "No messages." msgstr "" -#: ../../mod/message.php:338 ../../mod/message.php:424 +#: ../../mod/message.php:356 ../../mod/message.php:452 msgid "Delete message" msgstr "" -#: ../../mod/message.php:340 +#: ../../mod/message.php:358 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:359 +#: ../../mod/message.php:377 msgid "Message not found." msgstr "" -#: ../../mod/message.php:446 +#: ../../mod/message.php:453 +msgid "Recall message" +msgstr "" + +#: ../../mod/message.php:455 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/message.php:474 +msgid "Private Conversation" +msgstr "" + +#: ../../mod/message.php:478 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:448 +#: ../../mod/message.php:480 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:452 +#: ../../mod/message.php:484 msgid "Send Reply" msgstr "" @@ -5083,7 +5118,7 @@ msgid "Invalid connection." msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:332 ../../mod/connections.php:467 +#: ../../mod/connections.php:332 ../../mod/connections.php:468 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -5109,7 +5144,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:472 +#: ../../mod/intro.php:95 ../../mod/connections.php:473 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -5224,7 +5259,7 @@ msgstr "" msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:332 ../../mod/connections.php:467 +#: ../../mod/connections.php:332 ../../mod/connections.php:468 msgid "Unignore" msgstr "" @@ -5264,7 +5299,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: ../../mod/connections.php:397 ../../mod/connections.php:425 +#: ../../mod/connections.php:397 ../../mod/connections.php:426 msgid "Approve this connection" msgstr "" @@ -5292,218 +5327,222 @@ msgstr "" msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:426 -msgid "Connection has no individual permissions!" +#: ../../mod/connections.php:425 +msgid "inherited" msgstr "" #: ../../mod/connections.php:427 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connections.php:428 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy settings</" "a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:429 +#: ../../mod/connections.php:430 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:431 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:432 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:432 +#: ../../mod/connections.php:433 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:435 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:436 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:437 +#: ../../mod/connections.php:438 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:439 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:440 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:440 +#: ../../mod/connections.php:441 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:442 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:443 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:444 msgid "" -"Individual permissions are only enabled for <a href=\"settings\">privacy " -"settings</a> which are set to \"Only those you specifically allow\". " -"Otherwise they are controlled by your privacy settings." +"Some permissions may be inherited from your <a href=\"settings\">privacy " +"settings</a>, which have higher priority. Changing those on this page will " +"have no effect." msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:445 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:446 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:450 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:450 +#: ../../mod/connections.php:451 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:451 +#: ../../mod/connections.php:452 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:453 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:454 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:456 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:458 +#: ../../mod/connections.php:459 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:460 +#: ../../mod/connections.php:461 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:463 msgid "Update now" msgstr "" -#: ../../mod/connections.php:468 +#: ../../mod/connections.php:469 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:469 +#: ../../mod/connections.php:470 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:470 +#: ../../mod/connections.php:471 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:471 +#: ../../mod/connections.php:472 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:473 msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "" -#: ../../mod/connections.php:508 ../../mod/connections.php:580 +#: ../../mod/connections.php:509 ../../mod/connections.php:581 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:513 ../../mod/connections.php:587 +#: ../../mod/connections.php:514 ../../mod/connections.php:588 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:518 ../../mod/connections.php:601 +#: ../../mod/connections.php:519 ../../mod/connections.php:602 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:523 ../../mod/connections.php:594 +#: ../../mod/connections.php:524 ../../mod/connections.php:595 msgid "Archived" msgstr "" -#: ../../mod/connections.php:534 +#: ../../mod/connections.php:535 msgid "All" msgstr "" -#: ../../mod/connections.php:555 +#: ../../mod/connections.php:556 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:558 +#: ../../mod/connections.php:559 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:564 +#: ../../mod/connections.php:565 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:567 +#: ../../mod/connections.php:568 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:570 +#: ../../mod/connections.php:571 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:573 +#: ../../mod/connections.php:574 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:576 +#: ../../mod/connections.php:577 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:583 +#: ../../mod/connections.php:584 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:590 +#: ../../mod/connections.php:591 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:597 +#: ../../mod/connections.php:598 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:604 +#: ../../mod/connections.php:605 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:646 +#: ../../mod/connections.php:647 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:647 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:648 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:671 +#: ../../mod/connections.php:672 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:672 +#: ../../mod/connections.php:673 msgid "Finding: " msgstr "" @@ -5755,7 +5794,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:584 ../../mod/directory.php:145 +#: ../../mod/profiles.php:584 ../../mod/directory.php:147 msgid "Age: " msgstr "" @@ -6398,7 +6437,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1067 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1052 msgid "Wall Photos" msgstr "" @@ -6467,24 +6506,24 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:322 +#: ../../mod/item.php:321 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:366 +#: ../../mod/item.php:365 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:782 +#: ../../mod/item.php:767 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1146 +#: ../../mod/item.php:1131 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1152 +#: ../../mod/item.php:1137 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6653,23 +6692,23 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/directory.php:148 +#: ../../mod/directory.php:150 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:207 +#: ../../mod/directory.php:209 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:215 +#: ../../mod/directory.php:217 msgid "next page" msgstr "" -#: ../../mod/directory.php:215 +#: ../../mod/directory.php:217 msgid "previous page" msgstr "" -#: ../../mod/directory.php:222 +#: ../../mod/directory.php:224 msgid "No entries (some entries may be hidden)." msgstr "" diff --git a/version.inc b/version.inc index d5bf9feac..be191a19a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-16.468 +2013-10-18.470 |