diff options
| -rw-r--r-- | Zotlabs/Lib/System.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Dirsearch.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Pubsites.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 6 | ||||
| -rw-r--r-- | include/bb2diaspora.php | 6 | ||||
| -rw-r--r-- | include/taxonomy.php | 2 | ||||
| -rw-r--r-- | include/widgets.php | 5 | ||||
| -rw-r--r-- | include/wiki.php | 5 | ||||
| -rw-r--r-- | util/hmessages.po | 5600 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 91 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 33 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 8 |
13 files changed, 2932 insertions, 2842 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 32aaa82a9..26768af26 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -54,5 +54,11 @@ class System { return '0.0.0'; } - + static public function compatible_project($p) { + foreach(['hubzilla','zap'] as $t) { + if(stristr($p,$t)) + return true; + } + return false; + } } diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php index 927800bbb..9b2057203 100644 --- a/Zotlabs/Module/Dirsearch.php +++ b/Zotlabs/Module/Dirsearch.php @@ -12,7 +12,7 @@ class Dirsearch extends \Zotlabs\Web\Controller { } - function get() { + function get() { $ret = array('success' => false); @@ -457,6 +457,6 @@ class Dirsearch extends \Zotlabs\Web\Controller { } } return $ret; - } - + } + } diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php index 1c9cd5121..d87967189 100644 --- a/Zotlabs/Module/Pubsites.php +++ b/Zotlabs/Module/Pubsites.php @@ -36,7 +36,7 @@ class Pubsites extends \Zotlabs\Web\Controller { $o .= '</tr>'; if($j['sites']) { foreach($j['sites'] as $jj) { - if(! $jj['project']) + if(! \Zotlabs\Lib\System::compatible_project($jj['project'])) continue; if(strpos($jj['version'],' ')) { $x = explode(' ', $jj['version']); diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index edcd6ec58..c4fa63673 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -128,7 +128,7 @@ class Wiki extends \Zotlabs\Web\Controller { require_once('library/markdown.php'); $content = t('"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."'); $renderedContent = Markdown(json_decode($content)); - $hide_editor = false; + $hide_editor = true; $showPageControls = false; $showNewWikiButton = $wiki_owner; $showNewPageButton = false; @@ -209,8 +209,10 @@ class Wiki extends \Zotlabs\Web\Controller { $o .= replace_macros(get_markup_template('wiki.tpl'),array( '$wikiheaderName' => $wikiheaderName, '$wikiheaderPage' => $wikiheaderPage, - '$hideEditor' => $hide_editor, + '$hideEditor' => $hide_editor, // True will completely hide the content section and is used for the case of no wiki selected + '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'), '$showPageControls' => $showPageControls, + '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$tools_label' => 'Wiki Tools', '$showNewWikiButton'=> $showNewWikiButton, '$showNewPageButton'=> $showNewPageButton, diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index da02d6cac..e6c97a750 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -427,6 +427,12 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $Text = preg_replace_callback('/\@\!?\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', 'bb2dmention_callback', $Text); + // strip map tags, as the rendering is performed in bbcode() and the resulting output + // is not compatible with Diaspora (at least in the case of openstreetmap and probably + // due to the inclusion of an html iframe) + + $Text = preg_replace("/\[map\=(.*?)\]/ism", '$1', $Text); + $Text = preg_replace("/\[map\](.*?)\[\/map\]/ism", '$1', $Text); // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); diff --git a/include/taxonomy.php b/include/taxonomy.php index 067bd3246..0b4b2aa9a 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -386,7 +386,7 @@ function get_things($profile_hash,$uid) { $things[$k] = null; foreach($r as $rr) { - $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on likee = xchan_hash where + $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on liker = xchan_hash where target_type = '%s' and target_id = '%s' and channel_id = %d", dbesc(ACTIVITY_OBJ_THING), dbesc($rr['obj_obj']), diff --git a/include/widgets.php b/include/widgets.php index 3dc555b46..1441fbeb3 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -967,7 +967,7 @@ function widget_wiki_list($arr) { '$view' => t('View'), '$addnew' => t('Create new wiki'), '$create' => t('Create'), - '$wikiName' => array('wikiName', t('Wiki name'), '', ''), + '$wikiName' => array('wikiName', t('Wiki name')), '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], '$allow_cid' => $x['allow_cid'], @@ -975,7 +975,7 @@ function widget_wiki_list($arr) { '$deny_cid' => $x['deny_cid'], '$deny_gid' => $x['deny_gid'], '$bang' => $x['bang'], - '$notify' => t('Send notification') + '$notify' => array('postVisible', t('Send notification'), '', '', array(t('No'), t('Yes'))) )); } return ''; @@ -1017,6 +1017,7 @@ function widget_wiki_pages($arr) { '$pages' => $pages, '$canadd' => $can_create, '$addnew' => t('Add new page'), + '$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''), )); } diff --git a/include/wiki.php b/include/wiki.php index bcdf9d7d8..d2cb51bd3 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -32,13 +32,16 @@ function wiki_page_list($resource_id) { return array('pages' => null, 'wiki' => null); } $pages = array(); + $pages[] = array('title' => 'Home', 'url' => 'Home'); if (is_dir($w['path']) === true) { $files = array_diff(scandir($w['path']), array('.', '..', '.git')); // TODO: Check that the files are all text files foreach($files as $file) { // strip the .md file extension and unwrap URL encoding to leave HTML encoded name - $pages[] = array('title' => urldecode(substr($file, 0, -3)), 'url' => urlencode(substr($file, 0, -3))); + if( urldecode(substr($file, 0, -3)) !== 'Home') { + $pages[] = array('title' => urldecode(substr($file, 0, -3)), 'url' => urlencode(substr($file, 0, -3))); + } } } diff --git a/util/hmessages.po b/util/hmessages.po index 0293d32b7..3848dff06 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.15.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-11 00:05-0800\n" +"POT-Creation-Date: 2016-11-18 00:04-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" @@ -172,7 +172,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2723 +#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679 msgid "Collection" msgstr "" @@ -203,13 +203,13 @@ msgstr "" #: ../../extend/addon/addon/cdav/Mod_Cdav.php:744 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:752 -#: ../../include/widgets.php:1682 ../../include/conversation.php:1047 +#: ../../include/widgets.php:1744 ../../include/conversation.php:1047 msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85 #: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:96 -#: ../../include/conversation.php:1700 +#: ../../include/conversation.php:1699 msgid "Files" msgstr "" @@ -228,6 +228,7 @@ msgstr "" #: ../../extend/addon/addon/cdav/include/widgets.php:127 #: ../../extend/addon/addon/cdav/include/widgets.php:164 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147 +#: ../../include/widgets.php:969 msgid "Create" msgstr "" @@ -238,7 +239,7 @@ msgstr "" #: ../../Zotlabs/Module/Embedphotos.php:157 #: ../../extend/addon/addon/cdav/include/widgets.php:132 #: ../../extend/addon/addon/cdav/include/widgets.php:168 -#: ../../include/widgets.php:1695 +#: ../../include/widgets.php:1757 msgid "Upload" msgstr "" @@ -258,7 +259,7 @@ msgid "Type" msgstr "" #: ../../Zotlabs/Storage/Browser.php:235 -#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1397 +#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1390 msgid "Size" msgstr "" @@ -267,39 +268,40 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:238 -#: ../../Zotlabs/Module/Editblock.php:109 +#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Editpost.php:84 #: ../../Zotlabs/Module/Connections.php:290 #: ../../Zotlabs/Module/Connections.php:310 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:240 +#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192 +#: ../../Zotlabs/Module/Editblock.php:109 +#: ../../Zotlabs/Module/Webpages.php:240 #: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:341 -#: ../../Zotlabs/Lib/ThreadItem.php:106 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106 +#: ../../Zotlabs/Lib/Apps.php:341 #: ../../extend/addon/addon/cdav/include/widgets.php:125 #: ../../extend/addon/addon/cdav/include/widgets.php:161 #: ../../include/channel.php:961 ../../include/channel.php:965 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -#: ../../include/menu.php:113 +#: ../../include/widgets.php:965 ../../include/menu.php:113 msgid "Edit" msgstr "" #: ../../Zotlabs/Storage/Browser.php:239 -#: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Editlayout.php:137 -#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Editwebpage.php:170 +#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Module/Group.php:177 #: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Module/Webpages.php:242 +#: ../../Zotlabs/Module/Editblock.php:134 +#: ../../Zotlabs/Module/Webpages.php:242 #: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:342 -#: ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../Zotlabs/Lib/Apps.php:342 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:860 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149 #: ../../include/conversation.php:676 @@ -332,23 +334,12 @@ msgstr "" msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Profperm.php:28 -#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:114 -#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Dreport.php:10 -#: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Subthread.php:62 -#: ../../extend/addon/addon/frphotos/frphotos.php:81 -#: ../../extend/addon/addon/redfiles/redfiles.php:109 -#: ../../extend/addon/addon/redphotos/redphotos.php:119 -#: ../../include/items.php:399 -msgid "Permission denied" -msgstr "" - -#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:67 +#: ../../Zotlabs/Web/Router.php:67 ../../Zotlabs/Web/WebServer.php:128 #: ../../Zotlabs/Module/Achievements.php:34 -#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Authtest.php:16 -#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Page.php:35 +#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 #: ../../Zotlabs/Module/Cover_photo.php:290 #: ../../Zotlabs/Module/Editlayout.php:67 @@ -356,57 +347,58 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Appman.php:75 -#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Filestorage.php:23 +#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78 +#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Connedit.php:395 +#: ../../Zotlabs/Module/Filestorage.php:23 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Item.php:216 -#: ../../Zotlabs/Module/Item.php:224 ../../Zotlabs/Module/Item.php:1074 -#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Filestorage.php:120 +#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Events.php:267 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 -#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237 -#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mitem.php:115 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Photos.php:73 -#: ../../Zotlabs/Module/Setup.php:218 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:595 #: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Mail.php:135 +#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Photos.php:73 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 -#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113 +#: ../../Zotlabs/Module/Mail.php:135 ../../Zotlabs/Module/Profile.php:68 +#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 +#: ../../Zotlabs/Module/Rate.php:113 #: ../../Zotlabs/Module/Profile_photo.php:273 #: ../../Zotlabs/Module/Profile_photo.php:286 -#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Events.php:267 -#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29 -#: ../../Zotlabs/Module/Connedit.php:395 +#: ../../Zotlabs/Module/Setup.php:218 ../../Zotlabs/Module/Common.php:39 +#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 +#: ../../Zotlabs/Module/Item.php:216 ../../Zotlabs/Module/Item.php:224 +#: ../../Zotlabs/Module/Item.php:1074 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Webpages.php:116 -#: ../../Zotlabs/Module/Sharedwithme.php:11 -#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30 -#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 -#: ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:159 +#: ../../Zotlabs/Module/Wiki.php:262 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100 -#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Channel.php:107 +#: ../../Zotlabs/Module/Channel.php:237 ../../Zotlabs/Module/Channel.php:277 +#: ../../Zotlabs/Lib/Chatroom.php:137 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:55 #: ../../extend/addon/addon/keepout/keepout.php:36 #: ../../extend/addon/addon/pumpio/pumpio.php:40 #: ../../extend/addon/addon/openid/Mod_Id.php:53 #: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58 -#: ../../include/photos.php:27 ../../include/attach.php:142 -#: ../../include/attach.php:189 ../../include/attach.php:253 -#: ../../include/attach.php:267 ../../include/attach.php:274 -#: ../../include/attach.php:341 ../../include/attach.php:355 -#: ../../include/attach.php:362 ../../include/attach.php:439 -#: ../../include/attach.php:906 ../../include/attach.php:977 -#: ../../include/attach.php:1135 ../../include/items.php:3490 +#: ../../include/attach.php:142 ../../include/attach.php:189 +#: ../../include/attach.php:253 ../../include/attach.php:267 +#: ../../include/attach.php:274 ../../include/attach.php:341 +#: ../../include/attach.php:355 ../../include/attach.php:362 +#: ../../include/attach.php:439 ../../include/attach.php:906 +#: ../../include/attach.php:977 ../../include/attach.php:1135 +#: ../../include/items.php:3418 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -414,12 +406,23 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../Zotlabs/Web/Router.php:151 ../../Zotlabs/Module/Display.php:120 -#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79 +#: ../../Zotlabs/Web/Router.php:151 ../../Zotlabs/Module/Page.php:94 +#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:120 #: ../../include/help.php:65 msgid "Page not found." msgstr "" +#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:283 +#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Group.php:72 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 +#: ../../extend/addon/addon/frphotos/frphotos.php:81 +#: ../../extend/addon/addon/redfiles/redfiles.php:109 +#: ../../extend/addon/addon/redphotos/redphotos.php:119 +#: ../../include/items.php:327 +msgid "Permission denied" +msgstr "" + #: ../../Zotlabs/Zot/Auth.php:138 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " @@ -434,12 +437,12 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31 #: ../../Zotlabs/Module/Editlayout.php:31 #: ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12 -#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33 -#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33 +#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17 +#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Profile.php:20 +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Layouts.php:31 +#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33 #: ../../include/channel.php:862 msgid "Requested profile is not available." msgstr "" @@ -588,7 +591,7 @@ msgid "Membership on this site is by invitation only." msgstr "" #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:152 -#: ../../boot.php:1697 +#: ../../boot.php:1699 msgid "Register" msgstr "" @@ -603,121 +606,60 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Ratings.php:83 -#: ../../Zotlabs/Module/Photos.php:509 -#: ../../Zotlabs/Module/Viewconnections.php:23 -#: ../../extend/addon/addon/friendica/dfrn_request.php:794 -msgid "Public access denied." -msgstr "" - -#: ../../Zotlabs/Module/Display.php:40 -#: ../../Zotlabs/Module/Admin/Plugins.php:254 -#: ../../Zotlabs/Module/Admin/Themes.php:69 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60 -#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Viewsrc.php:24 -#: ../../include/items.php:3411 -msgid "Item not found." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:33 -#, php-format -msgid "Your service plan only allows %d channels." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42 -msgid "Nothing to import." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:98 -#: ../../Zotlabs/Module/Import_items.php:66 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:105 -#: ../../Zotlabs/Module/Import_items.php:72 -msgid "Imported file is empty." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:127 -#: ../../Zotlabs/Module/Import_items.php:88 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:167 -msgid "No channel. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:503 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Follow.php:31 +msgid "Channel added." msgstr "" -#: ../../Zotlabs/Module/Import.php:525 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." msgstr "" -#: ../../Zotlabs/Module/Import.php:530 -msgid "Import Channel" +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:531 +#: ../../Zotlabs/Module/Locs.php:66 msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:532 -#: ../../Zotlabs/Module/Import_items.php:121 -msgid "File to Upload" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:533 -msgid "Or provide the old server/hub details" +"Please select another location to become primary before removing the primary " +"location." msgstr "" -#: ../../Zotlabs/Module/Import.php:534 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" msgstr "" -#: ../../Zotlabs/Module/Import.php:535 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." msgstr "" -#: ../../Zotlabs/Module/Import.php:536 -msgid "Your old login password" +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Import.php:537 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692 +#: ../../Zotlabs/Module/Pubsites.php:51 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835 +#: ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Import.php:538 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Admin/Channels.php:160 +#: ../../Zotlabs/Module/Profiles.php:464 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139 +msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Import.php:539 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" +#: ../../Zotlabs/Module/Locs.php:119 +msgid "Primary" msgstr "" -#: ../../Zotlabs/Module/Import.php:540 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113 +msgid "Drop" msgstr "" -#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Connect.php:98 +#: ../../Zotlabs/Module/Locs.php:121 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Plugins.php:429 @@ -728,18 +670,21 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:166 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Module/Appman.php:126 +#: ../../Zotlabs/Module/Connedit.php:780 #: ../../Zotlabs/Module/Filestorage.php:165 -#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Group.php:85 -#: ../../Zotlabs/Module/Import_items.php:122 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1058 -#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216 -#: ../../Zotlabs/Module/Setup.php:315 ../../Zotlabs/Module/Setup.php:363 -#: ../../Zotlabs/Module/Mail.php:384 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:484 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Connedit.php:780 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 +#: ../../Zotlabs/Module/Events.php:484 +#: ../../Zotlabs/Module/Import_items.php:122 +#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Mitem.php:243 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Photos.php:668 +#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098 +#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Poke.php:186 +#: ../../Zotlabs/Module/Mail.php:384 ../../Zotlabs/Module/Pconfig.php:107 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Setup.php:315 +#: ../../Zotlabs/Module/Setup.php:363 ../../Zotlabs/Module/Invite.php:149 +#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Sources.php:114 +#: ../../Zotlabs/Module/Sources.php:149 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Tokens.php:167 @@ -747,11 +692,10 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:452 #: ../../Zotlabs/Module/Settings/Display.php:196 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196 -#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:729 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:729 #: ../../extend/addon/addon/chords/Mod_Chords.php:60 -#: ../../extend/addon/addon/diaspora/diaspora.php:703 +#: ../../extend/addon/addon/diaspora/diaspora.php:710 #: ../../extend/addon/addon/dwpost/dwpost.php:89 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124 #: ../../extend/addon/addon/friendica/friendica.php:128 @@ -800,64 +744,176 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 -msgid "Continue" +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" msgstr "" -#: ../../Zotlabs/Module/Connect.php:90 -msgid "Premium Channel Setup" +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." msgstr "" -#: ../../Zotlabs/Module/Connect.php:92 -msgid "Enable premium channel connection restrictions" +#: ../../Zotlabs/Module/Locs.php:124 +msgid "" +"When possible, drop a location by logging into that website/hub and removing " +"your channel." msgstr "" -#: ../../Zotlabs/Module/Connect.php:93 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +#: ../../Zotlabs/Module/Locs.php:125 +msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" +#: ../../Zotlabs/Module/Dreport.php:45 +msgid "Invalid message" msgstr "" -#: ../../Zotlabs/Module/Connect.php:96 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../Zotlabs/Module/Dreport.php:78 +msgid "no results" msgstr "" -#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 -msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." +#: ../../Zotlabs/Module/Dreport.php:93 +msgid "channel sync processed" msgstr "" -#: ../../Zotlabs/Module/Connect.php:106 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" msgstr "" -#: ../../Zotlabs/Module/Connect.php:114 -msgid "Restricted or Premium Channel" +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" msgstr "" -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:306 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:203 -#: ../../include/nav.php:170 ../../include/text.php:993 -#: ../../include/text.php:1005 ../../include/widgets.php:315 -msgid "Search" +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" msgstr "" -#: ../../Zotlabs/Module/Search.php:223 -#, php-format -msgid "Items tagged with: %s" +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" msgstr "" -#: ../../Zotlabs/Module/Search.php:225 +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:148 #, php-format -msgid "Search results for: %s" +msgid "Delivery report for %1$s" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:151 +msgid "Options" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:152 +msgid "Redeliver" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:60 +#: ../../Zotlabs/Module/Admin/Plugins.php:254 +#: ../../Zotlabs/Module/Admin/Themes.php:69 +#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:40 +#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Viewsrc.php:24 +#: ../../include/items.php:3339 +msgid "Item not found." +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:94 +msgid "# Accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:95 +msgid "# blocked accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:96 +msgid "# expired accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:97 +msgid "# expiring accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:108 +msgid "# Channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:109 +msgid "# primary" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:110 +msgid "# clones" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:116 +msgid "Message queues" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:133 +msgid "Your software should be updated" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Plugins.php:336 +#: ../../Zotlabs/Module/Admin/Plugins.php:427 +#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin/Themes.php:120 +#: ../../Zotlabs/Module/Admin/Themes.php:154 +#: ../../Zotlabs/Module/Admin/Accounts.php:164 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Site.php:256 +msgid "Administration" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:138 +msgid "Summary" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:141 +msgid "Registered accounts" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:142 +msgid "Pending registrations" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:143 +msgid "Registered channels" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:144 +msgid "Active plugins" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:145 +msgid "Version" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:146 +msgid "Repository version (master)" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:147 +msgid "Repository version (dev)" msgstr "" #: ../../Zotlabs/Module/Bookmarks.php:53 @@ -872,56 +928,51 @@ msgstr "" msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 -#: ../../Zotlabs/Module/Editlayout.php:79 -#: ../../Zotlabs/Module/Editwebpage.php:80 -#: ../../Zotlabs/Module/Editpost.php:24 -msgid "Item not found" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 -#: ../../Zotlabs/Module/Blocks.php:155 -msgid "Block Name" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:258 -#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Module/Chat.php:207 -#: ../../include/conversation.php:1165 -msgid "Insert web link" +#: ../../Zotlabs/Module/Help.php:23 +msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1276 -msgid "Title (optional)" +#: ../../Zotlabs/Module/Help.php:51 +msgid "$Projectname Documentation" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:133 -msgid "Edit Block" +#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Editwebpage.php:80 +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +msgid "Item not found" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 -msgid "Invalid profile identifier." +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:115 -msgid "Profile Visibility Editor" +#: ../../Zotlabs/Module/Editpost.php:107 ../../Zotlabs/Module/Rpost.php:138 +msgid "Edit post" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282 -msgid "Profile" +#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Directory.php:64 +#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Photos.php:509 +#: ../../Zotlabs/Module/Display.php:17 +#: ../../Zotlabs/Module/Viewconnections.php:23 +#: ../../extend/addon/addon/friendica/dfrn_request.php:794 +msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Profperm.php:119 -msgid "Click on a contact to add or remove." +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:306 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:203 +#: ../../include/nav.php:170 ../../include/text.php:986 +#: ../../include/text.php:998 ../../include/widgets.php:315 +msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:128 -msgid "Visible To" +#: ../../Zotlabs/Module/Search.php:223 +#, php-format +msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:144 -#: ../../Zotlabs/Module/Connections.php:145 -msgid "All Connections" +#: ../../Zotlabs/Module/Search.php:225 +#, php-format +msgid "Search results for: %s" msgstr "" #: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 @@ -954,17 +1005,28 @@ msgstr "" #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:994 -#: ../../include/text.php:1006 ../../include/widgets.php:201 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:987 +#: ../../include/text.php:999 ../../include/widgets.php:201 msgid "Save" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 -msgid "This site is not a directory server" +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 +#: ../../include/nav.php:95 ../../include/conversation.php:1692 +msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:33 -msgid "This directory server requires an access token" +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 +#: ../../Zotlabs/Module/Admin/Plugins.php:414 +#: ../../Zotlabs/Module/Wiki.php:200 ../../Zotlabs/Module/Wiki.php:241 +#: ../../Zotlabs/Module/Settings/Oauth.php:88 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../extend/addon/addon/friendica/dfrn_request.php:879 +#: ../../extend/addon/addon/js_upload/js_upload.php:46 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150 +#: ../../include/conversation.php:1264 ../../include/conversation.php:1313 +msgid "Cancel" msgstr "" #: ../../Zotlabs/Module/Connections.php:56 @@ -1011,6 +1073,11 @@ msgstr "" msgid "Show pending (new) connections" msgstr "" +#: ../../Zotlabs/Module/Connections.php:145 +#: ../../Zotlabs/Module/Profperm.php:144 +msgid "All Connections" +msgstr "" + #: ../../Zotlabs/Module/Connections.php:148 msgid "Show all connections" msgstr "" @@ -1087,7 +1154,7 @@ msgid "Recent activity" msgstr "" #: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209 -#: ../../include/nav.php:191 ../../include/text.php:923 +#: ../../include/nav.php:191 ../../include/text.php:916 msgid "Connections" msgstr "" @@ -1135,30 +1202,30 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4325 +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4253 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4326 +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4254 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4327 +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4255 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4328 +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4256 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4330 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4258 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1731 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1677 msgid "cover photo" msgstr "" @@ -1239,20 +1306,8 @@ msgstr "" msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Plugins.php:336 -#: ../../Zotlabs/Module/Admin/Plugins.php:427 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin/Themes.php:120 -#: ../../Zotlabs/Module/Admin/Themes.php:154 -#: ../../Zotlabs/Module/Admin/Accounts.php:164 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Module/Admin.php:137 -msgid "Administration" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1586 -#: ../../include/widgets.php:1596 +#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1648 +#: ../../include/widgets.php:1658 msgid "Logs" msgstr "" @@ -1299,7 +1354,7 @@ msgid "Enable" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:337 -#: ../../Zotlabs/Module/Admin/Plugins.php:428 ../../include/widgets.php:1564 +#: ../../Zotlabs/Module/Admin/Plugins.php:428 ../../include/widgets.php:1626 msgid "Plugins" msgstr "" @@ -1377,20 +1432,6 @@ msgstr "" msgid "Install" msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:414 -#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Wiki.php:200 ../../Zotlabs/Module/Wiki.php:240 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 -#: ../../extend/addon/addon/friendica/dfrn_request.php:879 -#: ../../extend/addon/addon/js_upload/js_upload.php:46 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150 -#: ../../include/conversation.php:1264 ../../include/conversation.php:1313 -msgid "Cancel" -msgstr "" - #: ../../Zotlabs/Module/Admin/Plugins.php:435 msgid "Manage Repos" msgstr "" @@ -1466,7 +1507,7 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1567 +#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1629 msgid "Profile Fields" msgstr "" @@ -1546,7 +1587,7 @@ msgid "" "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1562 +#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1624 msgid "Security" msgstr "" @@ -1646,7 +1687,7 @@ msgid "Screenshot" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:121 -#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1565 +#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1627 msgid "Themes" msgstr "" @@ -1729,7 +1770,7 @@ msgid "Account '%s' unblocked" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:165 -#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1560 +#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1622 msgid "Accounts" msgstr "" @@ -1861,7 +1902,7 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1561 +#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1623 msgid "Channels" msgstr "" @@ -1882,7 +1923,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1672 +#: ../../include/conversation.php:1671 msgid "Channel" msgstr "" @@ -1890,12 +1931,6 @@ msgstr "" msgid "UID" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:464 ../../Zotlabs/Module/Locs.php:118 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139 -msgid "Address" -msgstr "" - #: ../../Zotlabs/Module/Admin/Channels.php:162 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " @@ -1952,7 +1987,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:157 ../../include/text.php:2959 +#: ../../Zotlabs/Module/Admin/Site.php:157 ../../include/text.php:2915 msgid "Default" msgstr "" @@ -1970,15 +2005,15 @@ msgid "unsupported" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:216 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Api.php:97 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:408 +#: ../../Zotlabs/Module/Connedit.php:687 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653 #: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464 -#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Connedit.php:687 -#: ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Mitem.php:162 +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:641 +#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Settings/Channel.php:289 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../extend/addon/addon/dwpost/dwpost.php:73 @@ -2028,7 +2063,7 @@ msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 #: ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1719 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1721 msgid "No" msgstr "" @@ -2037,14 +2072,14 @@ msgid "Yes - with approval" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:218 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Api.php:96 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:408 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Profiles.php:641 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Photos.php:653 #: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464 -#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Removeme.php:63 +#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Mitem.php:162 +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:641 +#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Settings/Channel.php:289 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../extend/addon/addon/dwpost/dwpost.php:73 @@ -2094,7 +2129,7 @@ msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:227 ../../include/dir_fns.php:143 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 #: ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1719 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1721 msgid "Yes" msgstr "" @@ -2150,7 +2185,7 @@ msgstr "" msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:257 ../../include/widgets.php:1559 +#: ../../Zotlabs/Module/Admin/Site.php:257 ../../include/widgets.php:1621 msgid "Site" msgstr "" @@ -2432,12 +2467,8 @@ msgstr "" msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:75 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../Zotlabs/Module/Lockview.php:96 -msgid "Visible to:" +#: ../../Zotlabs/Module/Chanview.php:134 +msgid "toggle full screen mode" msgstr "" #: ../../Zotlabs/Module/Editlayout.php:127 @@ -2458,12 +2489,119 @@ msgstr "" msgid "Page link" msgstr "" +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:258 +#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Module/Editblock.php:111 +#: ../../Zotlabs/Module/Chat.php:207 ../../include/conversation.php:1165 +msgid "Insert web link" +msgstr "" + #: ../../Zotlabs/Module/Editwebpage.php:169 msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Follow.php:31 -msgid "Channel added." +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:25 +msgid "" +"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" +"\"register\">register as a new $Projectname member</a> to continue." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 +#: ../../extend/addon/addon/diaspora/inbound.php:1792 +#: ../../extend/addon/addon/redphotos/redphotohelper.php:74 +#: ../../include/text.php:1940 ../../include/conversation.php:120 +msgid "photo" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../extend/addon/addon/diaspora/inbound.php:1792 +#: ../../include/text.php:1946 ../../include/conversation.php:148 +msgid "status" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:256 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943 +#: ../../include/conversation.php:123 ../../include/event.php:961 +msgid "event" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:419 +#: ../../extend/addon/addon/diaspora/inbound.php:1821 +#: ../../include/conversation.php:164 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:423 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Module/Like.php:538 +msgid "Action completed." +msgstr "" + +#: ../../Zotlabs/Module/Like.php:539 +msgid "Thank you." msgstr "" #: ../../Zotlabs/Module/Manage.php:136 @@ -2552,14 +2690,10 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2312 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268 msgid "Menus" msgstr "" -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" -msgstr "" - #: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157 #: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:251 #: ../../include/page_widgets.php:47 @@ -2654,8 +2788,8 @@ msgid "Name of app" msgstr "" #: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 -#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707 #: ../../Zotlabs/Module/Events.php:453 ../../Zotlabs/Module/Events.php:458 +#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707 #: ../../include/datetime.php:259 msgid "Required" msgstr "" @@ -2695,608 +2829,600 @@ msgstr "" msgid "Location (URL) to purchase app" msgstr "" -#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:107 -msgid "Edit post" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 -msgid "Authorize application connection" +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Api.php:73 -msgid "Return to your app and insert this Security Code:" +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Api.php:83 -msgid "Please login to continue." +#: ../../Zotlabs/Module/Connedit.php:256 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Api.php:95 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../Zotlabs/Module/Connedit.php:258 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Help.php:23 -msgid "Documentation Search" +#: ../../Zotlabs/Module/Connedit.php:308 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Help.php:51 -msgid "$Projectname Documentation" +#: ../../Zotlabs/Module/Connedit.php:440 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Ffsapi.php:12 -msgid "Share content from Firefox to $Projectname" +#: ../../Zotlabs/Module/Connedit.php:460 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Ffsapi.php:15 -msgid "Activate the Firefox $Projectname provider" +#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484 +#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502 +#: ../../Zotlabs/Module/Connedit.php:515 +msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:168 -#: ../../include/widgets.php:102 -msgid "Apps" +#: ../../Zotlabs/Module/Connedit.php:539 +msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 -#: ../../Zotlabs/Module/Siteinfo.php:48 -msgid "$Projectname" +#: ../../Zotlabs/Module/Connedit.php:555 ../../Zotlabs/Lib/Apps.php:221 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 +#: ../../include/nav.php:89 ../../include/conversation.php:969 +msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Home.php:92 +#: ../../Zotlabs/Module/Connedit.php:558 #, php-format -msgid "Welcome to %s" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:87 -msgid "Permission Denied." -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:146 -msgid "Edit file permissions" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:152 -#: ../../Zotlabs/Module/Photos.php:658 ../../Zotlabs/Module/Photos.php:1047 -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../Zotlabs/Module/Chat.php:234 ../../include/acl_selectors.php:208 -msgid "Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:159 -msgid "Set/edit permissions" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:160 -msgid "Include all files and sub folders" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:161 -msgid "Return to file list" -msgstr "" - -#: ../../Zotlabs/Module/Filestorage.php:163 -msgid "Copy/paste this code to attach file to a post" +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:164 -msgid "Copy/paste this URL to link file from a web page" +#: ../../Zotlabs/Module/Connedit.php:562 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:166 -msgid "Share this file" +#: ../../Zotlabs/Module/Connedit.php:565 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:167 -msgid "Show URL to this file" +#: ../../Zotlabs/Module/Connedit.php:569 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:168 -msgid "Notify your contacts about this file" +#: ../../Zotlabs/Module/Connedit.php:572 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Item.php:182 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Connedit.php:579 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Item.php:435 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Connedit.php:580 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Item.php:475 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Connedit.php:584 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Item.php:855 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Connedit.php:587 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Item.php:992 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Connedit.php:588 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Item.php:1113 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Connedit.php:592 +msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Item.php:1120 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../Zotlabs/Module/Connedit.php:592 +msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Item.php:1127 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../Zotlabs/Module/Connedit.php:595 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Chanview.php:134 -msgid "toggle full screen mode" +#: ../../Zotlabs/Module/Connedit.php:596 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183 -#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619 -#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62 -msgid "Profile not found." +#: ../../Zotlabs/Module/Connedit.php:600 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." +#: ../../Zotlabs/Module/Connedit.php:600 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 -msgid "Profile-" +#: ../../Zotlabs/Module/Connedit.php:603 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126 -msgid "New profile created." +#: ../../Zotlabs/Module/Connedit.php:604 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:110 -msgid "Profile unavailable to clone." +#: ../../Zotlabs/Module/Connedit.php:611 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:145 -msgid "Profile unavailable to export." +#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:529 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:250 -msgid "Profile Name is required." +#: ../../Zotlabs/Module/Connedit.php:627 ../../include/widgets.php:530 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:421 -msgid "Marital Status" +#: ../../Zotlabs/Module/Connedit.php:628 +#: ../../Zotlabs/Module/Settings/Channel.php:61 +#: ../../Zotlabs/Module/Settings/Channel.php:65 +#: ../../Zotlabs/Module/Settings/Channel.php:66 +#: ../../Zotlabs/Module/Settings/Channel.php:69 +#: ../../Zotlabs/Module/Settings/Channel.php:80 ../../include/channel.php:402 +#: ../../include/channel.php:403 ../../include/channel.php:410 +#: ../../include/selectors.php:123 ../../include/widgets.php:531 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:425 -msgid "Romantic Partner" +#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:532 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730 -msgid "Likes" +#: ../../Zotlabs/Module/Connedit.php:687 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731 -msgid "Dislikes" +#: ../../Zotlabs/Module/Connedit.php:687 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738 -msgid "Work/Employment" +#: ../../Zotlabs/Module/Connedit.php:692 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:440 -msgid "Religion" +#: ../../Zotlabs/Module/Connedit.php:695 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:444 -msgid "Political Views" +#: ../../Zotlabs/Module/Connedit.php:698 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:448 -#: ../../extend/addon/addon/openid/MysqlProvider.php:74 -msgid "Gender" +#: ../../Zotlabs/Module/Connedit.php:747 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:452 -msgid "Sexual Preference" +#: ../../Zotlabs/Module/Connedit.php:751 ../../include/widgets.php:656 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:456 -msgid "Homepage" +#: ../../Zotlabs/Module/Connedit.php:751 ../../include/items.php:3905 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:460 -msgid "Interests" +#: ../../Zotlabs/Module/Connedit.php:752 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:692 -#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:468 -#: ../../Zotlabs/Module/Pubsites.php:51 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835 -#: ../../include/js_strings.php:25 -msgid "Location" +#: ../../Zotlabs/Module/Connedit.php:752 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:554 -msgid "Profile updated." +#: ../../Zotlabs/Module/Connedit.php:754 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:638 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Connedit.php:755 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:680 -msgid "Edit Profile Details" +#: ../../Zotlabs/Module/Connedit.php:759 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:682 -msgid "View this profile" +#: ../../Zotlabs/Module/Connedit.php:760 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765 -#: ../../include/channel.php:983 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Connedit.php:762 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:684 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Rate.php:155 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:685 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Connedit.php:764 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Connedit.php:765 ../../Zotlabs/Module/Connedit.php:770 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:687 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Connedit.php:767 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:688 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Connedit.php:768 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Connedit.php:768 ../../Zotlabs/Module/Connedit.php:769 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:690 -msgid "Add profile things" +#: ../../Zotlabs/Module/Connedit.php:769 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105 -#: ../../include/conversation.php:1585 -msgid "Personal" +#: ../../Zotlabs/Module/Connedit.php:771 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 -msgid "Relation" +#: ../../Zotlabs/Module/Connedit.php:776 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Settings/Tokens.php:163 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Connedit.php:781 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Connedit.php:783 +#: ../../Zotlabs/Module/Settings/Tokens.php:160 +msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:698 -msgid "Your gender" +#: ../../Zotlabs/Module/Connedit.php:784 +#: ../../Zotlabs/Module/Settings/Tokens.php:161 +msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 -msgid "Marital status" +#: ../../Zotlabs/Module/Connedit.php:786 +#: ../../Zotlabs/Module/Settings/Tokens.php:165 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Connedit.php:787 +#: ../../Zotlabs/Module/Settings/Tokens.php:166 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 -msgid "Profile name" +#: ../../Zotlabs/Module/Connedit.php:788 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Connedit.php:789 +msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:707 -msgid "Your full name" +#: ../../Zotlabs/Module/Lockview.php:75 +msgid "Remote privacy information not available." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:708 -msgid "Title/Description" +#: ../../Zotlabs/Module/Lockview.php:96 +msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 -msgid "Street address" +#: ../../Zotlabs/Module/Ffsapi.php:12 +msgid "Share content from Firefox to $Projectname" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:712 -msgid "Locality/City" +#: ../../Zotlabs/Module/Ffsapi.php:15 +msgid "Activate the Firefox $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:713 -msgid "Region/State" +#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:168 +#: ../../include/widgets.php:102 +msgid "Apps" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../Zotlabs/Module/Siteinfo.php:48 +msgid "$Projectname" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:715 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157 -msgid "Country" +#: ../../Zotlabs/Module/Home.php:92 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Filestorage.php:87 +msgid "Permission Denied." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Filestorage.php:103 +msgid "File not found." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 -msgid "Since (date)" +#: ../../Zotlabs/Module/Filestorage.php:146 +msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Filestorage.php:152 +#: ../../Zotlabs/Module/Photos.php:658 ../../Zotlabs/Module/Photos.php:1047 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 +#: ../../Zotlabs/Module/Chat.php:234 ../../include/acl_selectors.php:208 +msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:725 -#: ../../extend/addon/addon/openid/MysqlProvider.php:68 -msgid "Homepage URL" +#: ../../Zotlabs/Module/Filestorage.php:159 +msgid "Set/edit permissions" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Hometown" +#: ../../Zotlabs/Module/Filestorage.php:160 +msgid "Include all files and sub folders" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "Political views" +#: ../../Zotlabs/Module/Filestorage.php:161 +msgid "Return to file list" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 -msgid "Religious views" +#: ../../Zotlabs/Module/Filestorage.php:163 +msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Filestorage.php:164 +msgid "Copy/paste this URL to link file from a web page" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Filestorage.php:166 +msgid "Share this file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Musical interests" +#: ../../Zotlabs/Module/Filestorage.php:167 +msgid "Show URL to this file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Books, literature" +#: ../../Zotlabs/Module/Filestorage.php:168 +msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Television" +#: ../../Zotlabs/Module/Match.php:26 +msgid "Profile Match" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Match.php:35 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Match.php:67 +msgid "is interested in:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:737 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Match.php:68 ../../Zotlabs/Module/Directory.php:328 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1036 +#: ../../include/widgets.php:147 ../../include/widgets.php:184 +#: ../../include/connections.php:78 ../../include/conversation.php:971 +msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 -msgid "School/Education" +#: ../../Zotlabs/Module/Match.php:74 +msgid "No matches" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 +msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "My other channels" +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979 -msgid "Profile Image" +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961 -#: ../../include/nav.php:91 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Acl.php:313 -msgid "network" +#: ../../Zotlabs/Module/Events.php:106 +msgid "Event can not end before it has started." msgstr "" -#: ../../Zotlabs/Module/Acl.php:323 -msgid "RSS" +#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117 +#: ../../Zotlabs/Module/Events.php:139 +msgid "Unable to generate preview." msgstr "" -#: ../../Zotlabs/Module/Directory.php:245 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Directory.php:256 -msgid "Gender: " +#: ../../Zotlabs/Module/Events.php:115 +msgid "Event title and start time are required." msgstr "" -#: ../../Zotlabs/Module/Directory.php:258 -msgid "Status: " +#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261 +msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:260 -msgid "Homepage: " +#: ../../Zotlabs/Module/Events.php:453 +msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215 -msgid "Age:" +#: ../../Zotlabs/Module/Events.php:453 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:831 +msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051 -#: ../../include/event.php:52 ../../include/event.php:84 -#: ../../include/bb2diaspora.php:512 -msgid "Location:" +#: ../../Zotlabs/Module/Events.php:455 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Directory.php:320 -msgid "Description:" +#: ../../Zotlabs/Module/Events.php:456 +msgid "Edit Category" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231 -msgid "Hometown:" +#: ../../Zotlabs/Module/Events.php:456 +msgid "Category" msgstr "" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239 -msgid "About:" +#: ../../Zotlabs/Module/Events.php:459 +msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:56 -#: ../../Zotlabs/Module/Match.php:68 ../../include/channel.php:1036 -#: ../../include/connections.php:78 ../../include/widgets.php:147 -#: ../../include/widgets.php:184 ../../include/conversation.php:971 -msgid "Connect" +#: ../../Zotlabs/Module/Events.php:459 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:832 +msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Directory.php:329 -msgid "Public Forum:" +#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463 +msgid "Finish date and time are not known or not relevant" msgstr "" -#: ../../Zotlabs/Module/Directory.php:332 -msgid "Keywords: " +#: ../../Zotlabs/Module/Events.php:462 +msgid "Edit finish date and time" msgstr "" -#: ../../Zotlabs/Module/Directory.php:335 -msgid "Don't suggest" +#: ../../Zotlabs/Module/Events.php:462 +msgid "Finish date and time" msgstr "" -#: ../../Zotlabs/Module/Directory.php:337 -msgid "Common connections:" +#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../Zotlabs/Module/Directory.php:386 -msgid "Global Directory" +#: ../../Zotlabs/Module/Events.php:464 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." msgstr "" -#: ../../Zotlabs/Module/Directory.php:386 -msgid "Local Directory" +#: ../../Zotlabs/Module/Events.php:466 +msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Directory.php:392 -msgid "Finding:" +#: ../../Zotlabs/Module/Events.php:468 +msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 -#: ../../include/contact_widgets.php:24 -msgid "Channel Suggestions" +#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Photos.php:1099 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:738 +#: ../../include/page_widgets.php:43 ../../include/conversation.php:1217 +msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 -msgid "next page" +#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1280 +msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 -msgid "previous page" +#: ../../Zotlabs/Module/Events.php:485 +msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:398 -msgid "Sort options" +#: ../../Zotlabs/Module/Events.php:596 ../../Zotlabs/Module/Cal.php:263 +msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Directory.php:399 -msgid "Alphabetic" +#: ../../Zotlabs/Module/Events.php:624 +msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Directory.php:400 -msgid "Reverse Alphabetic" +#: ../../Zotlabs/Module/Events.php:626 +msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Directory.php:401 -msgid "Newest to Oldest" +#: ../../Zotlabs/Module/Events.php:651 ../../Zotlabs/Module/Cal.php:312 +#: ../../include/text.php:1748 +msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 -msgid "Oldest to Newest" +#: ../../Zotlabs/Module/Events.php:660 +msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Directory.php:419 -msgid "No entries (some entries may be hidden)." +#: ../../Zotlabs/Module/Events.php:679 ../../Zotlabs/Module/Cal.php:335 +msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Group.php:24 -msgid "Privacy group created." +#: ../../Zotlabs/Module/Events.php:679 ../../Zotlabs/Module/Cal.php:335 +msgid "Create Event" msgstr "" -#: ../../Zotlabs/Module/Group.php:30 -msgid "Could not create privacy group." +#: ../../Zotlabs/Module/Events.php:680 ../../Zotlabs/Module/Events.php:689 +#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343 +#: ../../Zotlabs/Module/Photos.php:940 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:842 +msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3944 -msgid "Privacy group not found." +#: ../../Zotlabs/Module/Events.php:681 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344 +#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Setup.php:270 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:843 +msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Group.php:58 -msgid "Privacy group updated." +#: ../../Zotlabs/Module/Events.php:682 ../../Zotlabs/Module/Cal.php:338 +msgid "Export" msgstr "" -#: ../../Zotlabs/Module/Group.php:90 -msgid "Create a group of channels." +#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Blocks.php:166 +#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:59 +#: ../../Zotlabs/Module/Webpages.php:246 ../../include/page_widgets.php:42 +#: ../../include/widgets.php:967 +msgid "View" msgstr "" -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 -msgid "Privacy group name: " +#: ../../Zotlabs/Module/Events.php:686 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:845 +msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 -msgid "Members are visible to other channels" +#: ../../Zotlabs/Module/Events.php:687 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846 +msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Group.php:111 -msgid "Privacy group removed." +#: ../../Zotlabs/Module/Events.php:688 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 +msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Group.php:113 -msgid "Unable to remove privacy group." +#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:345 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:844 +msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Group.php:183 -msgid "Privacy group editor" +#: ../../Zotlabs/Module/Events.php:722 +msgid "Event removed" msgstr "" -#: ../../Zotlabs/Module/Group.php:197 -msgid "Members" +#: ../../Zotlabs/Module/Events.php:725 +msgid "Failed to remove event" msgstr "" -#: ../../Zotlabs/Module/Group.php:199 -msgid "All Connected Channels" +#: ../../Zotlabs/Module/Acl.php:313 +msgid "network" msgstr "" -#: ../../Zotlabs/Module/Group.php:231 -msgid "Click on a channel to add or remove." +#: ../../Zotlabs/Module/Acl.php:323 +msgid "RSS" msgstr "" #: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 @@ -3325,255 +3451,236 @@ msgstr "" msgid "%s element installation failed" msgstr "" -#: ../../Zotlabs/Module/Import_items.php:104 -msgid "Import completed" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:119 -msgid "Import Items" +#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Import_items.php:120 -msgid "Use this form to import existing posts and content from an export file." +#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:83 +#: ../../Zotlabs/Module/Import.php:98 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20 -#: ../../Zotlabs/Module/Chat.php:25 -#: ../../extend/addon/addon/chess/chess.php:400 -msgid "You must be logged in to see this page." +#: ../../Zotlabs/Module/Import_items.php:72 +#: ../../Zotlabs/Module/Import.php:105 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Channel.php:44 -msgid "Posts and comments" +#: ../../Zotlabs/Module/Import_items.php:88 +#: ../../Zotlabs/Module/Import.php:127 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Channel.php:45 -msgid "Only posts" +#: ../../Zotlabs/Module/Import_items.php:104 +msgid "Import completed" msgstr "" -#: ../../Zotlabs/Module/Channel.php:104 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Import_items.php:119 +msgid "Import Items" msgstr "" -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 -msgid "Location not found." +#: ../../Zotlabs/Module/Import_items.php:120 +msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Locs.php:62 -msgid "Location lookup failed." +#: ../../Zotlabs/Module/Import_items.php:121 +#: ../../Zotlabs/Module/Import.php:532 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Locs.php:66 -msgid "" -"Please select another location to become primary before removing the primary " -"location." -msgstr "" +#: ../../Zotlabs/Module/Directory.php:245 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" -#: ../../Zotlabs/Module/Locs.php:95 -msgid "Syncing locations" +#: ../../Zotlabs/Module/Directory.php:256 +msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Locs.php:105 -msgid "No locations found." +#: ../../Zotlabs/Module/Directory.php:258 +msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Locs.php:116 -msgid "Manage Channel Locations" +#: ../../Zotlabs/Module/Directory.php:260 +msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 -msgid "Primary" +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215 +msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:122 -msgid "Sync Now" +#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1051 +#: ../../include/bb2diaspora.php:512 ../../include/event.php:52 +#: ../../include/event.php:84 +msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:123 -msgid "Please wait several minutes between consecutive operations." +#: ../../Zotlabs/Module/Directory.php:320 +msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:124 -msgid "" -"When possible, drop a location by logging into that website/hub and removing " -"your channel." +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231 +msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:125 -msgid "Use this form to drop the location if the hub is no longer operating." +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239 +msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:94 -msgid "# Accounts" +#: ../../Zotlabs/Module/Directory.php:329 +msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:95 -msgid "# blocked accounts" +#: ../../Zotlabs/Module/Directory.php:332 +msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:96 -msgid "# expired accounts" +#: ../../Zotlabs/Module/Directory.php:335 +msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Admin.php:97 -msgid "# expiring accounts" +#: ../../Zotlabs/Module/Directory.php:337 +msgid "Common connections:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:108 -msgid "# Channels" +#: ../../Zotlabs/Module/Directory.php:386 +msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Admin.php:109 -msgid "# primary" +#: ../../Zotlabs/Module/Directory.php:386 +msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Admin.php:110 -msgid "# clones" +#: ../../Zotlabs/Module/Directory.php:392 +msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:116 -msgid "Message queues" +#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64 +#: ../../include/contact_widgets.php:24 +msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Admin.php:133 -msgid "Your software should be updated" +#: ../../Zotlabs/Module/Directory.php:397 +msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Admin.php:138 -msgid "Summary" +#: ../../Zotlabs/Module/Directory.php:397 +msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Admin.php:141 -msgid "Registered accounts" +#: ../../Zotlabs/Module/Directory.php:398 +msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Admin.php:142 -msgid "Pending registrations" +#: ../../Zotlabs/Module/Directory.php:399 +msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Registered channels" +#: ../../Zotlabs/Module/Directory.php:400 +msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 -msgid "Active plugins" +#: ../../Zotlabs/Module/Directory.php:401 +msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 -msgid "Version" +#: ../../Zotlabs/Module/Directory.php:402 +msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 -msgid "Repository version (master)" +#: ../../Zotlabs/Module/Directory.php:419 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../Zotlabs/Module/Admin.php:147 -msgid "Repository version (dev)" +#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 +msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" +#: ../../Zotlabs/Module/Api.php:73 +msgid "Return to your app and insert this Security Code:" msgstr "" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." +#: ../../Zotlabs/Module/Api.php:83 +msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Like.php:25 +#: ../../Zotlabs/Module/Api.php:95 msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." -msgstr "" - -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" +#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +msgid "Continue" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." +#: ../../Zotlabs/Module/Connect.php:90 +msgid "Premium Channel Setup" msgstr "" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." +#: ../../Zotlabs/Module/Connect.php:92 +msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 -#: ../../extend/addon/addon/diaspora/inbound.php:1792 -#: ../../extend/addon/addon/redphotos/redphotohelper.php:74 -#: ../../include/text.php:1984 ../../include/conversation.php:120 -msgid "photo" +#: ../../Zotlabs/Module/Connect.php:93 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../extend/addon/addon/diaspora/inbound.php:1792 -#: ../../include/text.php:1990 ../../include/conversation.php:148 -msgid "status" +#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" msgstr "" -#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:256 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:961 -#: ../../include/text.php:1987 ../../include/conversation.php:123 -msgid "event" +#: ../../Zotlabs/Module/Connect.php:96 +msgid "" +"Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 -#: ../../extend/addon/addon/diaspora/inbound.php:1821 -#: ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." msgstr "" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../Zotlabs/Module/Connect.php:106 +msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" +#: ../../Zotlabs/Module/Connect.php:114 +msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" +#: ../../Zotlabs/Module/Network.php:96 +msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" +#: ../../Zotlabs/Module/Network.php:136 +msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s is attending %2$s's %3$s" +#: ../../Zotlabs/Module/Network.php:141 +msgid "forum" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" +#: ../../Zotlabs/Module/Network.php:153 +msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 -#, php-format -msgid "%1$s may attend %2$s's %3$s" +#: ../../Zotlabs/Module/Network.php:221 +msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Like.php:538 -msgid "Action completed." +#: ../../Zotlabs/Module/Network.php:230 +msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Like.php:539 -msgid "Thank you." +#: ../../Zotlabs/Module/Network.php:256 +msgid "Invalid connection." msgstr "" #: ../../Zotlabs/Module/Magic.php:71 @@ -3736,83 +3843,463 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:45 -msgid "Invalid message" +#: ../../Zotlabs/Module/Group.php:24 +msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:78 -msgid "no results" +#: ../../Zotlabs/Module/Group.php:30 +msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:93 -msgid "channel sync processed" +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 +#: ../../include/items.php:3872 +msgid "Privacy group not found." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:97 -msgid "queued" +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:101 -msgid "posted" +#: ../../Zotlabs/Module/Group.php:90 +msgid "Create a group of channels." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:105 -msgid "accepted for delivery" +#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 +msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Dreport.php:109 -msgid "updated" +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 +msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:112 -msgid "update ignored" +#: ../../Zotlabs/Module/Group.php:111 +msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:115 -msgid "permission denied" +#: ../../Zotlabs/Module/Group.php:113 +msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:119 -msgid "recipient not found" +#: ../../Zotlabs/Module/Group.php:183 +msgid "Privacy group editor" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:122 -msgid "mail recalled" +#: ../../Zotlabs/Module/Group.php:197 +msgid "Members" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:125 -msgid "duplicate mail received" +#: ../../Zotlabs/Module/Group.php:199 +msgid "All Connected Channels" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:128 -msgid "mail delivered" +#: ../../Zotlabs/Module/Group.php:231 +msgid "Click on a channel to add or remove." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:148 +#: ../../Zotlabs/Module/Notify.php:57 +#: ../../Zotlabs/Module/Notifications.php:35 +msgid "No more system notifications." +msgstr "" + +#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:39 +msgid "System Notifications" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:33 #, php-format -msgid "Delivery report for %1$s" +msgid "Your service plan only allows %d channels." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 -msgid "Options" +#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:152 -msgid "Redeliver" +#: ../../Zotlabs/Module/Import.php:167 +msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:35 -msgid "No more system notifications." +#: ../../Zotlabs/Module/Import.php:503 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:39 -msgid "System Notifications" +#: ../../Zotlabs/Module/Import.php:525 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" +#: ../../Zotlabs/Module/Import.php:530 +msgid "Import Channel" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:531 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:533 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:534 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:535 +msgid "Your old login email address" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:536 +msgid "Your old login password" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:537 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:538 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:539 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:540 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183 +#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619 +#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62 +msgid "Profile not found." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 +msgid "Profile-" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126 +msgid "New profile created." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:110 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:145 +msgid "Profile unavailable to export." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:250 +msgid "Profile Name is required." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:421 +msgid "Marital Status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:425 +msgid "Romantic Partner" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730 +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731 +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738 +msgid "Work/Employment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:440 +msgid "Religion" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:444 +msgid "Political Views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:448 +#: ../../extend/addon/addon/openid/MysqlProvider.php:74 +msgid "Gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:452 +msgid "Sexual Preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:456 +msgid "Homepage" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:460 +msgid "Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:554 +msgid "Profile updated." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:638 +msgid "Hide your connections list from viewers of this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:680 +msgid "Edit Profile Details" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:682 +msgid "View this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765 +#: ../../include/channel.php:983 +msgid "Edit visibility" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:684 +msgid "Profile Tools" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:685 +msgid "Change cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954 +msgid "Change profile photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:687 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:688 +msgid "Clone this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:689 +msgid "Delete this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:690 +msgid "Add profile things" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105 +#: ../../include/conversation.php:1585 +msgid "Personal" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Relation" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55 +msgid "Miscellaneous" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:696 +msgid "Import profile from file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:697 +msgid "Export profile to file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:698 +msgid "Your gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:699 +msgid "Marital status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:700 +msgid "Sexual preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:703 +msgid "Profile name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:705 +msgid "This is your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:707 +msgid "Your full name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:708 +msgid "Title/Description" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:711 +msgid "Street address" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:712 +msgid "Locality/City" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:713 +msgid "Region/State" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:714 +msgid "Postal/Zip code" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:715 +#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157 +msgid "Country" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Who (if applicable)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:721 +msgid "Since (date)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:724 +msgid "Tell us about yourself" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../extend/addon/addon/openid/MysqlProvider.php:68 +msgid "Homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Hometown" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Political views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:728 +msgid "Religious views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:729 +msgid "Keywords used in directory listings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:729 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Musical interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Books, literature" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Television" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Film/Dance/Culture/Entertainment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:736 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:737 +msgid "Love/Romance" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "School/Education" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Contact information and social networks" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961 +#: ../../include/nav.php:91 +msgid "Edit Profiles" +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:69 +msgid "Permissions denied." +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2291 +msgid "Import" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:254 +msgid "sent you a private message" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:302 +msgid "added your channel" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:312 +msgid "g A l F d" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:330 +msgid "[today]" +msgstr "" + +#: ../../Zotlabs/Module/Ping.php:339 +msgid "posted an event" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:140 +msgid "Create Channel" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:141 +msgid "" +"A channel is your identity on this network. It can represent a person, a " +"blog, or a forum to name a few. Channels can make connections with other " +"channels to share information with highly detailed permissions." +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:142 +msgid "" +"or <a href=\"import\">import an existing channel</a> from another location." msgstr "" #: ../../Zotlabs/Module/Photos.php:82 @@ -3905,12 +4392,12 @@ msgid "Show Oldest First" msgstr "" #: ../../Zotlabs/Module/Photos.php:783 ../../Zotlabs/Module/Photos.php:1337 -#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1676 +#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1738 msgid "View Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:814 -#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1693 +#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1755 msgid "Edit Album" msgstr "" @@ -3934,24 +4421,10 @@ msgstr "" msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:940 ../../Zotlabs/Module/Events.php:680 -#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:332 -#: ../../Zotlabs/Module/Cal.php:339 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:842 -msgid "Previous" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:944 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Setup.php:270 -#: ../../Zotlabs/Module/Events.php:681 ../../Zotlabs/Module/Events.php:690 -#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:843 -msgid "Next" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:1033 msgid "Edit photo" msgstr "" @@ -4022,12 +4495,6 @@ msgstr "" msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:738 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1217 -msgid "Preview" -msgstr "" - #: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:593 msgctxt "title" msgid "Likes" @@ -4070,13 +4537,13 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 #: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198 -#: ../../include/conversation.php:1784 +#: ../../include/conversation.php:1783 msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190 #: ../../include/channel.php:1190 ../../include/taxonomy.php:403 -#: ../../include/conversation.php:1808 +#: ../../include/conversation.php:1807 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -4084,7 +4551,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195 -#: ../../include/conversation.php:1811 +#: ../../include/conversation.php:1810 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4127,6 +4594,305 @@ msgstr "" msgid "Recent Photos" msgstr "" +#: ../../Zotlabs/Module/Notifications.php:40 ../../include/nav.php:196 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228 +#: ../../include/conversation.php:975 +msgid "Poke" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:169 +msgid "Poke somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:172 +msgid "Poke/Prod" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:173 +msgid "Poke, prod or do other things to somebody" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:180 +msgid "Recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:181 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 +msgid "Make this post private" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:38 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:45 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:52 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:70 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:149 +msgid "Messages" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:184 +msgid "Message recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:197 +msgid "Conversation removed." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:211 ../../Zotlabs/Module/Mail.php:320 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1200 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:212 ../../Zotlabs/Module/Mail.php:321 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:240 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:248 +msgid "Send Private Message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:249 ../../Zotlabs/Module/Mail.php:374 +msgid "To:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:376 +msgid "Subject:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:255 ../../Zotlabs/Module/Invite.php:138 +msgid "Your message:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:382 +#: ../../include/conversation.php:1260 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:259 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:262 ../../Zotlabs/Module/Mail.php:387 +#: ../../include/conversation.php:1305 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:264 ../../Zotlabs/Module/Mail.php:389 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:741 +#: ../../include/conversation.php:1310 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:346 +msgid "Delete message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:347 +msgid "Delivery report" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:348 +msgid "Recall message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:350 +msgid "Message has been recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:367 +msgid "Delete Conversation" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:369 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:373 +msgid "Send Reply" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:378 +#, php-format +msgid "Your message for %s (%s):" +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:27 +msgid "Unable to find your hub." +msgstr "" + +#: ../../Zotlabs/Module/Oexchange.php:41 +msgid "Post successful." +msgstr "" + +#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +msgid "This setting requires special processing and editing has been blocked." +msgstr "" + +#: ../../Zotlabs/Module/Pconfig.php:48 +msgid "Configuration Editor" +msgstr "" + +#: ../../Zotlabs/Module/Pconfig.php:49 +msgid "" +"Warning: Changing some settings could render your channel inoperable. Please " +"leave this page unless you are comfortable with and knowledgeable about how " +"to correctly use this feature." +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:19 +#, php-format +msgid "Version %s" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Installed plugins/addons/apps:" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:36 +msgid "No installed plugins/addons/apps" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:49 +msgid "" +"This is a hub of $Projectname - a global cooperative network of " +"decentralized privacy enhanced websites." +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:51 +msgid "Tag: " +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:53 +msgid "Last background fetch: " +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:55 +msgid "Current load average: " +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:58 +msgid "Running at web location" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:59 +msgid "" +"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more " +"about $Projectname." +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:60 +msgid "Bug reports and issues: please visit" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:62 +msgid "$projectname issues" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:63 +msgid "" +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" +msgstr "" + +#: ../../Zotlabs/Module/Siteinfo.php:65 +msgid "Site Administrators" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 +#: ../../Zotlabs/Module/Editblock.php:108 +msgid "Block Name" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267 +msgid "Blocks" +msgstr "" + +#: ../../Zotlabs/Module/Blocks.php:156 +msgid "Block Title" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2269 +msgid "Layouts" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225 +#: ../../include/nav.php:164 ../../include/help.php:53 +#: ../../include/help.php:58 +msgid "Help" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:185 +msgid "Comanche page description language help" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:189 +msgid "Layout Description" +msgstr "" + +#: ../../Zotlabs/Module/Layouts.php:194 +msgid "Download PDL file" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:156 +msgid "Website:" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:159 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:161 +msgid "Optionally explain your rating (this information is public)" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:186 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:293 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:409 +msgid "Use Photo for Profile" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:409 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../Zotlabs/Module/Profile_photo.php:410 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:181 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:193 +msgid "Use" +msgstr "" + #: ../../Zotlabs/Module/Setup.php:182 msgid "$Projectname Server - Setup" msgstr "" @@ -4544,193 +5310,16 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../Zotlabs/Module/Network.php:96 -msgid "No such group" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:136 -msgid "No such channel" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:141 -msgid "forum" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:153 -msgid "Search Results For:" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:221 -msgid "Privacy group is empty" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:230 -msgid "Privacy group: " -msgstr "" - -#: ../../Zotlabs/Module/Network.php:256 -msgid "Invalid connection." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:140 -msgid "Create Channel" -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:141 -msgid "" -"A channel is your identity on this network. It can represent a person, a " -"blog, or a forum to name a few. Channels can make connections with other " -"channels to share information with highly detailed permissions." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:142 -msgid "" -"or <a href=\"import\">import an existing channel</a> from another location." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:38 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:45 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:52 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:70 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:149 -msgid "Messages" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:184 -msgid "Message recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:197 -msgid "Conversation removed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:211 ../../Zotlabs/Module/Mail.php:320 -#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1200 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:212 ../../Zotlabs/Module/Mail.php:321 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:240 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:248 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:249 ../../Zotlabs/Module/Mail.php:374 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:376 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:255 ../../Zotlabs/Module/Invite.php:138 -msgid "Your message:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:257 ../../Zotlabs/Module/Mail.php:382 -#: ../../include/conversation.php:1260 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:259 -msgid "Send" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:262 ../../Zotlabs/Module/Mail.php:387 -#: ../../include/conversation.php:1305 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:264 ../../Zotlabs/Module/Mail.php:389 -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:741 -#: ../../include/conversation.php:1310 -msgid "Encrypt text" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:346 -msgid "Delete message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:347 -msgid "Delivery report" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:348 -msgid "Recall message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:350 -msgid "Message has been recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:367 -msgid "Delete Conversation" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:369 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:373 -msgid "Send Reply" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:378 -#, php-format -msgid "Your message for %s (%s):" -msgstr "" - -#: ../../Zotlabs/Module/Notifications.php:40 ../../include/nav.php:196 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228 -#: ../../include/conversation.php:975 -msgid "Poke" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:169 -msgid "Poke somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:172 -msgid "Poke/Prod" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:173 -msgid "Poke, prod or do other things to somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:180 -msgid "Recipient" +#: ../../Zotlabs/Module/Common.php:14 +msgid "No channel." msgstr "" -#: ../../Zotlabs/Module/Poke.php:181 -msgid "Choose what you wish to do to recipient" +#: ../../Zotlabs/Module/Common.php:43 +msgid "Common connections" msgstr "" -#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 -msgid "Make this post private" +#: ../../Zotlabs/Module/Common.php:48 +msgid "No connections in common." msgstr "" #: ../../Zotlabs/Module/Invite.php:29 @@ -4798,355 +5387,58 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Oexchange.php:27 -msgid "Unable to find your hub." -msgstr "" - -#: ../../Zotlabs/Module/Oexchange.php:41 -msgid "Post successful." -msgstr "" - -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 -msgid "This setting requires special processing and editing has been blocked." -msgstr "" - -#: ../../Zotlabs/Module/Pconfig.php:48 -msgid "Configuration Editor" -msgstr "" - -#: ../../Zotlabs/Module/Pconfig.php:49 -msgid "" -"Warning: Changing some settings could render your channel inoperable. Please " -"leave this page unless you are comfortable with and knowledgeable about how " -"to correctly use this feature." -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:19 -#, php-format -msgid "Version %s" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:34 -msgid "Installed plugins/addons/apps:" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:36 -msgid "No installed plugins/addons/apps" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:49 -msgid "" -"This is a hub of $Projectname - a global cooperative network of " -"decentralized privacy enhanced websites." -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:51 -msgid "Tag: " -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:53 -msgid "Last background fetch: " -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:55 -msgid "Current load average: " -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:58 -msgid "Running at web location" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:59 -msgid "" -"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more " -"about $Projectname." -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:60 -msgid "Bug reports and issues: please visit" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:62 -msgid "$projectname issues" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:63 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:65 -msgid "Site Administrators" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2311 -msgid "Blocks" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:156 -msgid "Block Title" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 -#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Pubsites.php:59 -#: ../../Zotlabs/Module/Webpages.php:246 ../../include/page_widgets.php:42 -msgid "View" -msgstr "" - -#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2313 -msgid "Layouts" -msgstr "" - -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225 -#: ../../include/help.php:53 ../../include/help.php:58 -#: ../../include/nav.php:164 -msgid "Help" +#: ../../Zotlabs/Module/Item.php:182 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:185 -msgid "Comanche page description language help" +#: ../../Zotlabs/Module/Item.php:435 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:189 -msgid "Layout Description" +#: ../../Zotlabs/Module/Item.php:475 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 -msgid "Download PDL file" +#: ../../Zotlabs/Module/Item.php:855 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Rate.php:155 ../../Zotlabs/Module/Connedit.php:763 -#: ../../include/js_strings.php:20 -msgid "Rating" +#: ../../Zotlabs/Module/Item.php:992 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Rate.php:156 -msgid "Website:" +#: ../../Zotlabs/Module/Item.php:1113 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Rate.php:159 +#: ../../Zotlabs/Module/Item.php:1120 #, php-format -msgid "Remote Channel [%s] (not yet known on this site)" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:160 -msgid "Rating (this information is public)" -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:161 -msgid "Optionally explain your rating (this information is public)" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:186 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:293 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:409 -msgid "Use Photo for Profile" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:409 -msgid "Upload Profile Photo" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:410 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:181 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:193 -msgid "Use" -msgstr "" - -#: ../../Zotlabs/Module/Common.php:14 -msgid "No channel." -msgstr "" - -#: ../../Zotlabs/Module/Common.php:43 -msgid "Common connections" -msgstr "" - -#: ../../Zotlabs/Module/Common.php:48 -msgid "No connections in common." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:106 -msgid "Event can not end before it has started." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117 -#: ../../Zotlabs/Module/Events.php:139 -msgid "Unable to generate preview." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:115 -msgid "Event title and start time are required." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261 -msgid "Event not found." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:453 -msgid "Edit event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:453 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:831 -msgid "Event title" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:455 -msgid "Categories (comma-separated list)" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:456 -msgid "Edit Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:456 -msgid "Category" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:459 -msgid "Edit start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:459 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:832 -msgid "Start date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463 -msgid "Finish date and time are not known or not relevant" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:462 -msgid "Edit finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:462 -msgid "Finish date and time" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465 -msgid "Adjust for viewer timezone" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:464 -msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." -msgstr "" - -#: ../../Zotlabs/Module/Events.php:466 -msgid "Edit Description" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:468 -msgid "Edit Location" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1280 -msgid "Permission settings" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:485 -msgid "Advanced Options" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:596 ../../Zotlabs/Module/Cal.php:259 -msgid "l, F j" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:624 -msgid "Edit event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:626 -msgid "Delete event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:651 ../../Zotlabs/Module/Cal.php:308 -#: ../../include/text.php:1792 -msgid "Link to Source" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:660 -msgid "calendar" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:679 ../../Zotlabs/Module/Cal.php:331 -msgid "Edit Event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:679 ../../Zotlabs/Module/Cal.php:331 -msgid "Create Event" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:682 ../../Zotlabs/Module/Cal.php:334 -msgid "Export" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:686 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:845 -msgid "Month" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:687 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846 -msgid "Week" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:688 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 -msgid "Day" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:844 -msgid "Today" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:722 -msgid "Event removed" -msgstr "" - -#: ../../Zotlabs/Module/Events.php:725 -msgid "Failed to remove event" +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/nav.php:95 ../../include/conversation.php:1693 -msgid "Photos" +#: ../../Zotlabs/Module/Item.php:1127 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Ping.php:254 -msgid "sent you a private message" +#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63 +msgid "Invalid profile identifier." msgstr "" -#: ../../Zotlabs/Module/Ping.php:302 -msgid "added your channel" +#: ../../Zotlabs/Module/Profperm.php:115 +msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Ping.php:312 -msgid "g A l F d" +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282 +msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Ping.php:330 -msgid "[today]" +#: ../../Zotlabs/Module/Profperm.php:119 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../Zotlabs/Module/Ping.php:339 -msgid "posted an event" +#: ../../Zotlabs/Module/Profperm.php:128 +msgid "Visible To" msgstr "" #: ../../Zotlabs/Module/Lostpass.php:19 @@ -5173,7 +5465,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1723 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725 msgid "Password Reset" msgstr "" @@ -5388,7 +5680,7 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1391 +#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1453 msgid "Public Hubs" msgstr "" @@ -5425,293 +5717,12 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:80 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:256 -msgid "Connection updated." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:258 -msgid "Failed to update connection record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:308 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:440 -msgid "Could not access address book record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:460 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484 -#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502 -#: ../../Zotlabs/Module/Connedit.php:515 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:539 -msgid "Connection has been removed." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:555 ../../Zotlabs/Lib/Apps.php:221 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 -#: ../../include/nav.php:89 ../../include/conversation.php:969 -msgid "View Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:558 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:562 -msgid "Refresh Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:565 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:569 -msgid "Recent Activity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:572 -msgid "View recent posts and comments" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:579 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:580 -msgid "This connection is blocked!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:584 -msgid "Unignore" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:587 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:588 -msgid "This connection is ignored!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:592 -msgid "Unarchive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:592 -msgid "Archive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:595 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:596 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:600 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:600 -msgid "Hide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:603 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:604 -msgid "This connection is hidden!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:611 -msgid "Delete this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:529 -msgid "Me" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:627 ../../include/widgets.php:530 -msgid "Family" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:628 -#: ../../Zotlabs/Module/Settings/Channel.php:61 -#: ../../Zotlabs/Module/Settings/Channel.php:65 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:69 -#: ../../Zotlabs/Module/Settings/Channel.php:80 ../../include/channel.php:402 -#: ../../include/channel.php:403 ../../include/channel.php:410 -#: ../../include/selectors.php:123 ../../include/widgets.php:531 -msgid "Friends" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:532 -msgid "Acquaintances" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:687 -msgid "Approve this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:687 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:692 -msgid "Set Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:695 -msgid "Set Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:698 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:747 -msgid "none" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:751 ../../include/widgets.php:656 -msgid "Connection Default Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:751 ../../include/items.php:3977 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:752 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:752 -msgid "Connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:754 -msgid "This connection's primary address is" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:755 -msgid "Available locations:" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:759 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:760 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:762 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:764 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:765 ../../Zotlabs/Module/Connedit.php:770 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:767 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:768 -msgid "Only import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:768 ../../Zotlabs/Module/Connedit.php:769 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:769 -msgid "Do not import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:771 -msgid "This information is public!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:776 -msgid "Connection Pending Approval" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:779 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:781 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:783 -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -msgid "Their Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:784 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -msgid "My Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:786 -#: ../../Zotlabs/Module/Settings/Tokens.php:165 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:787 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:788 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1276 +msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:789 -msgid "Last update:" +#: ../../Zotlabs/Module/Editblock.php:133 +msgid "Edit Block" msgstr "" #: ../../Zotlabs/Module/Service_limits.php:23 @@ -5735,7 +5746,7 @@ msgid "Export selected" msgstr "" #: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/nav.php:109 ../../include/conversation.php:1746 +#: ../../include/nav.php:109 ../../include/conversation.php:1745 msgid "Webpages" msgstr "" @@ -5816,13 +5827,31 @@ msgstr "" msgid "Remove this file" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:20 ../../Zotlabs/Module/Chat.php:25 +#: ../../Zotlabs/Module/Channel.php:32 +#: ../../extend/addon/addon/chess/chess.php:400 +msgid "You must be logged in to see this page." +msgstr "" + #: ../../Zotlabs/Module/Wiki.php:34 msgid "Not found" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:59 +msgid "Invalid channel" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:99 +msgid "Error retrieving wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:105 +msgid "Error creating zip file export folder" +msgstr "" + #: ../../Zotlabs/Module/Wiki.php:126 ../../Zotlabs/Lib/Apps.php:219 #: ../../include/features.php:99 ../../include/nav.php:111 -#: ../../include/conversation.php:1756 ../../include/conversation.php:1759 +#: ../../include/conversation.php:1755 ../../include/conversation.php:1758 msgid "Wiki" msgstr "" @@ -5836,6 +5865,14 @@ msgid "" "saved*.\"" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:149 +msgid "Wiki not found" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:174 +msgid "Error retrieving page content" +msgstr "" + #: ../../Zotlabs/Module/Wiki.php:198 msgid "Revision Comparison" msgstr "" @@ -5844,55 +5881,67 @@ msgstr "" msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:230 +#: ../../Zotlabs/Module/Wiki.php:231 msgid "Enter the name of your new wiki:" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:231 +#: ../../Zotlabs/Module/Wiki.php:232 msgid "Enter the name of the new page:" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:232 +#: ../../Zotlabs/Module/Wiki.php:233 msgid "Enter the new name:" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:238 ../../include/conversation.php:1169 +#: ../../Zotlabs/Module/Wiki.php:239 ../../include/conversation.php:1169 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:239 ../../include/conversation.php:1263 +#: ../../Zotlabs/Module/Wiki.php:240 ../../include/conversation.php:1263 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:241 ../../include/conversation.php:1265 +#: ../../Zotlabs/Module/Wiki.php:242 ../../include/conversation.php:1265 #: ../../include/conversation.php:1312 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:242 ../../include/conversation.php:1205 +#: ../../Zotlabs/Module/Wiki.php:243 ../../include/conversation.php:1205 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:243 ../../include/conversation.php:1206 +#: ../../Zotlabs/Module/Wiki.php:244 ../../include/conversation.php:1206 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:244 ../../include/conversation.php:1207 +#: ../../Zotlabs/Module/Wiki.php:245 ../../include/conversation.php:1207 msgid "Choose a different album..." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:245 ../../include/conversation.php:1208 +#: ../../Zotlabs/Module/Wiki.php:246 ../../include/conversation.php:1208 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:246 ../../include/conversation.php:1209 +#: ../../Zotlabs/Module/Wiki.php:247 ../../include/conversation.php:1209 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:247 ../../include/conversation.php:1210 +#: ../../Zotlabs/Module/Wiki.php:248 ../../include/conversation.php:1210 msgid "Error getting album" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:299 +msgid "Error creating wiki. Invalid name." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:309 +msgid "Wiki created, but error creating Home page." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:314 +msgid "Error creating wiki" +msgstr "" + #: ../../Zotlabs/Module/Sources.php:37 msgid "Failed to create source. No channel selected." msgstr "" @@ -5995,7 +6044,7 @@ msgstr "" msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1992 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948 #: ../../include/conversation.php:150 msgid "comment" msgstr "" @@ -6562,14 +6611,6 @@ msgstr "" msgid "Start calendar week on monday" msgstr "" -#: ../../Zotlabs/Module/Settings/Featured.php:24 -msgid "No feature settings configured" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:31 -msgid "Feature/Addon Settings" -msgstr "" - #: ../../Zotlabs/Module/Settings/Display.php:137 msgid "No special theme for mobile devices" msgstr "" @@ -6683,6 +6724,14 @@ msgstr "" msgid "Grid page max height of content (in pixels)" msgstr "" +#: ../../Zotlabs/Module/Settings/Featured.php:24 +msgid "No feature settings configured" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:31 +msgid "Feature/Addon Settings" +msgstr "" + #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98 msgid "Tag removed" msgstr "" @@ -6752,14 +6801,6 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Cal.php:69 -msgid "Permissions denied." -msgstr "" - -#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2335 -msgid "Import" -msgstr "" - #: ../../Zotlabs/Module/Viewconnections.php:65 msgid "No connections." msgstr "" @@ -6838,20 +6879,16 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Module/Match.php:26 -msgid "Profile Match" -msgstr "" - -#: ../../Zotlabs/Module/Match.php:35 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../Zotlabs/Module/Channel.php:44 +msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Match.php:67 -msgid "is interested in:" +#: ../../Zotlabs/Module/Channel.php:45 +msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Match.php:74 -msgid "No matches" +#: ../../Zotlabs/Module/Channel.php:104 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" #: ../../Zotlabs/Lib/Chatroom.php:27 @@ -6874,102 +6911,211 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:205 -msgid "Site Admin" +#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914 +msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:206 -msgid "Bug Report" +#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46 +#: ../../extend/addon/addon/diaspora/util.php:218 +#: ../../extend/addon/addon/diaspora/util.php:231 +#: ../../include/network.php:1915 +msgid "$projectname" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:207 -msgid "View Bookmarks" +#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917 +msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Apps.php:208 -msgid "My Chatrooms" +#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919 +#, php-format +msgid "%s Administrator" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:210 -msgid "Firefox Share" +#: ../../Zotlabs/Lib/Enotify.php:116 +#, php-format +msgid "%s <!item_type!>" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:211 -msgid "Remote Diagnostics" +#: ../../Zotlabs/Lib/Enotify.php:120 +#, php-format +msgid "[$Projectname:Notify] New mail received at %s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:319 -msgid "Suggest Channels" +#: ../../Zotlabs/Lib/Enotify.php:122 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:115 -#: ../../boot.php:1715 -msgid "Login" +#: ../../Zotlabs/Lib/Enotify.php:123 +#, php-format +msgid "%1$s sent you %2$s." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:184 -msgid "Grid" +#: ../../Zotlabs/Lib/Enotify.php:123 +msgid "a private message" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:187 -msgid "Channel Home" +#: ../../Zotlabs/Lib/Enotify.php:124 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:206 -#: ../../include/conversation.php:1710 ../../include/conversation.php:1713 -msgid "Events" +#: ../../Zotlabs/Lib/Enotify.php:183 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:172 -msgid "Directory" +#: ../../Zotlabs/Lib/Enotify.php:191 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:198 -msgid "Mail" +#: ../../Zotlabs/Lib/Enotify.php:200 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:99 -msgid "Chat" +#: ../../Zotlabs/Lib/Enotify.php:211 +#, php-format +msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:231 -msgid "Probe" +#: ../../Zotlabs/Lib/Enotify.php:212 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:232 -msgid "Suggest" +#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:230 +#: ../../Zotlabs/Lib/Enotify.php:256 ../../Zotlabs/Lib/Enotify.php:274 +#: ../../Zotlabs/Lib/Enotify.php:288 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:233 -msgid "Random Channel" +#: ../../Zotlabs/Lib/Enotify.php:221 +#, php-format +msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:234 -msgid "Invite" +#: ../../Zotlabs/Lib/Enotify.php:223 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1563 -msgid "Features" +#: ../../Zotlabs/Lib/Enotify.php:225 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:236 -#: ../../extend/addon/addon/openid/MysqlProvider.php:69 -msgid "Language" +#: ../../Zotlabs/Lib/Enotify.php:249 +#, php-format +msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:237 -msgid "Post" +#: ../../Zotlabs/Lib/Enotify.php:250 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 -#: ../../extend/addon/addon/openid/MysqlProvider.php:58 -#: ../../extend/addon/addon/openid/MysqlProvider.php:59 -#: ../../extend/addon/addon/openid/MysqlProvider.php:60 -msgid "Profile Photo" +#: ../../Zotlabs/Lib/Enotify.php:251 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:339 -msgid "Purchase" +#: ../../Zotlabs/Lib/Enotify.php:263 +#, php-format +msgid "[$Projectname:Notify] %1$s poked you" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:264 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:265 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:281 +#, php-format +msgid "[$Projectname:Notify] %s tagged your post" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:282 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:283 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:295 +msgid "[$Projectname:Notify] Introduction received" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:296 +#, php-format +msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:297 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:301 ../../Zotlabs/Lib/Enotify.php:320 +#, php-format +msgid "You may visit their profile at %s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:303 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:310 +msgid "[$Projectname:Notify] Friend suggestion received" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:311 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:312 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:318 +msgid "Name:" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:319 +msgid "Photo:" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:322 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:540 +msgid "[$Projectname:Notify]" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:700 +msgid "created a new post" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:701 +#, php-format +msgid "commented on %s's post" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:683 @@ -7165,211 +7311,103 @@ msgstr "" msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914 -msgid "$Projectname Notification" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46 -#: ../../extend/addon/addon/diaspora/util.php:218 -#: ../../extend/addon/addon/diaspora/util.php:231 -#: ../../include/network.php:1915 -msgid "$projectname" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917 -msgid "Thank You," -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919 -#, php-format -msgid "%s Administrator" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:112 -#, php-format -msgid "%s <!item_type!>" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:116 -#, php-format -msgid "[$Projectname:Notify] New mail received at %s" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:118 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:119 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:119 -msgid "a private message" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:120 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:179 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:187 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:196 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:207 -#, php-format -msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:208 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:211 ../../Zotlabs/Lib/Enotify.php:226 -#: ../../Zotlabs/Lib/Enotify.php:252 ../../Zotlabs/Lib/Enotify.php:270 -#: ../../Zotlabs/Lib/Enotify.php:284 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:217 -#, php-format -msgid "[$Projectname:Notify] %s posted to your profile wall" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:219 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:221 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:245 -#, php-format -msgid "[$Projectname:Notify] %s tagged you" +#: ../../Zotlabs/Lib/Apps.php:205 +msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:246 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../Zotlabs/Lib/Apps.php:206 +#: ../../extend/addon/addon/buglink/buglink.php:16 +msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:247 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +#: ../../Zotlabs/Lib/Apps.php:207 +msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:259 -#, php-format -msgid "[$Projectname:Notify] %1$s poked you" +#: ../../Zotlabs/Lib/Apps.php:208 +msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:260 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../Zotlabs/Lib/Apps.php:210 +msgid "Firefox Share" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:261 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +#: ../../Zotlabs/Lib/Apps.php:211 +msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:277 -#, php-format -msgid "[$Projectname:Notify] %s tagged your post" +#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:319 +msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:278 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:115 +#: ../../boot.php:1717 +msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:279 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:184 +msgid "Grid" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:291 -msgid "[$Projectname:Notify] Introduction received" +#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:187 +msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:292 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:206 +#: ../../include/conversation.php:1709 ../../include/conversation.php:1712 +msgid "Events" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:293 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:172 +msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:297 ../../Zotlabs/Lib/Enotify.php:316 -#, php-format -msgid "You may visit their profile at %s" +#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:198 +msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:299 -#, php-format -msgid "Please visit %s to approve or reject the connection request." +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:99 +msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:306 -msgid "[$Projectname:Notify] Friend suggestion received" +#: ../../Zotlabs/Lib/Apps.php:231 +msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:307 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +#: ../../Zotlabs/Lib/Apps.php:232 +msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:308 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +#: ../../Zotlabs/Lib/Apps.php:233 +msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:314 -msgid "Name:" +#: ../../Zotlabs/Lib/Apps.php:234 +msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:315 -msgid "Photo:" +#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1625 +msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:318 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../Zotlabs/Lib/Apps.php:236 +#: ../../extend/addon/addon/openid/MysqlProvider.php:69 +msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:536 -msgid "[$Projectname:Notify]" +#: ../../Zotlabs/Lib/Apps.php:237 +msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:696 -msgid "created a new post" +#: ../../Zotlabs/Lib/Apps.php:238 +#: ../../extend/addon/addon/openid/MysqlProvider.php:58 +#: ../../extend/addon/addon/openid/MysqlProvider.php:59 +#: ../../extend/addon/addon/openid/MysqlProvider.php:60 +msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:697 -#, php-format -msgid "commented on %s's post" +#: ../../Zotlabs/Lib/Apps.php:339 +msgid "Purchase" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:34 @@ -7445,10 +7483,6 @@ msgid "" "view" msgstr "" -#: ../../extend/addon/addon/buglink/buglink.php:16 -msgid "Report Bug" -msgstr "" - #: ../../extend/addon/addon/chords/Mod_Chords.php:44 msgid "" "This is a fairly comprehensive and complete guitar chord dictionary which " @@ -7495,27 +7529,27 @@ msgstr "" msgid "Quick Reference" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:667 +#: ../../extend/addon/addon/diaspora/diaspora.php:671 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:685 +#: ../../extend/addon/addon/diaspora/diaspora.php:692 msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:689 +#: ../../extend/addon/addon/diaspora/diaspora.php:696 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:693 +#: ../../extend/addon/addon/diaspora/diaspora.php:700 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:698 +#: ../../extend/addon/addon/diaspora/diaspora.php:705 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../extend/addon/addon/diaspora/diaspora.php:703 +#: ../../extend/addon/addon/diaspora/diaspora.php:710 msgid "Diaspora Protocol Settings" msgstr "" @@ -10169,6 +10203,25 @@ msgstr "" msgid "The error message was:" msgstr "" +#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44 +#, php-format +msgid "Reconnecting %d connections" +msgstr "" + +#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63 +msgid "Diaspora Reconnect" +msgstr "" + +#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65 +msgid "" +"Use this form to re-establish Diaspora connections which were initially made " +"from a different hub." +msgstr "" + +#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70 +msgid "Reconnect" +msgstr "" + #: ../../extend/addon/addon/mailtest/mailtest.php:19 msgid "Send test email" msgstr "" @@ -10281,25 +10334,6 @@ msgid "" "share their own locations with the group." msgstr "" -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44 -#, php-format -msgid "Reconnecting %d connections" -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63 -msgid "Diaspora Reconnect" -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65 -msgid "" -"Use this form to re-establish Diaspora connections which were initially made " -"from a different hub." -msgstr "" - -#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70 -msgid "Reconnect" -msgstr "" - #: ../../include/Import/import_diaspora.php:16 msgid "No username found in import file." msgstr "" @@ -10459,246 +10493,6 @@ msgstr "" msgid "Like this thing" msgstr "" -#: ../../include/selectors.php:30 -msgid "Frequently" -msgstr "" - -#: ../../include/selectors.php:31 -msgid "Hourly" -msgstr "" - -#: ../../include/selectors.php:32 -msgid "Twice daily" -msgstr "" - -#: ../../include/selectors.php:33 -msgid "Daily" -msgstr "" - -#: ../../include/selectors.php:34 -msgid "Weekly" -msgstr "" - -#: ../../include/selectors.php:35 -msgid "Monthly" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Currently Male" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Currently Female" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Mostly Male" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Mostly Female" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Transgender" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Intersex" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Transsexual" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Hermaphrodite" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Neuter" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Non-specific" -msgstr "" - -#: ../../include/selectors.php:49 -msgid "Undecided" -msgstr "" - -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Males" -msgstr "" - -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Females" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Gay" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Lesbian" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "No Preference" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Bisexual" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Autosexual" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Abstinent" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Virgin" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Deviant" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Fetish" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Oodles" -msgstr "" - -#: ../../include/selectors.php:85 -msgid "Nonsexual" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Single" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Lonely" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Available" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unavailable" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Has crush" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Infatuated" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Dating" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unfaithful" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Sex Addict" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Friends/Benefits" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Casual" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Engaged" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Married" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Imaginarily married" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Partners" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Cohabiting" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Common law" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Happy" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Not looking" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Swinger" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Betrayed" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Separated" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Unstable" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Divorced" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Imaginarily divorced" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Widowed" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Uncertain" -msgstr "" - -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "It's complicated" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Don't care" -msgstr "" - -#: ../../include/selectors.php:123 -msgid "Ask me" -msgstr "" - #: ../../include/acl_selectors.php:198 msgid "Who can see this?" msgstr "" @@ -10728,138 +10522,139 @@ msgid "" "permissions set who is allowed to view the post." msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:490 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:496 -msgid "Starts:" +#: ../../include/attach.php:248 ../../include/attach.php:336 +msgid "Item was not found." msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:504 -msgid "Finishes:" +#: ../../include/attach.php:497 +msgid "No source file." msgstr "" -#: ../../include/event.php:824 -msgid "This event has been added to your calendar." +#: ../../include/attach.php:519 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/event.php:1024 -msgid "Not specified" +#: ../../include/attach.php:537 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/event.php:1025 -msgid "Needs Action" +#: ../../include/attach.php:668 +#, php-format +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/event.php:1026 -msgid "Completed" +#: ../../include/attach.php:682 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/event.php:1027 -msgid "In Process" +#: ../../include/attach.php:852 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/event.php:1028 -msgid "Cancelled" +#: ../../include/attach.php:865 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/help.php:31 -msgid "Help:" +#: ../../include/attach.php:920 ../../include/attach.php:936 +msgid "Path not available." msgstr "" -#: ../../include/message.php:20 -msgid "No recipient provided." +#: ../../include/attach.php:982 ../../include/attach.php:1140 +msgid "Empty pathname" msgstr "" -#: ../../include/message.php:25 -msgid "[no subject]" +#: ../../include/attach.php:1008 +msgid "duplicate filename or path" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/attach.php:1030 +msgid "Path not found." msgstr "" -#: ../../include/message.php:223 -msgid "Stored post could not be verified." +#: ../../include/attach.php:1094 +msgid "mkdir failed." msgstr "" -#: ../../include/photos.php:115 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/attach.php:1098 +msgid "database storage failed." msgstr "" -#: ../../include/photos.php:122 -msgid "Image file is empty." +#: ../../include/attach.php:1146 +msgid "Empty path" msgstr "" -#: ../../include/photos.php:260 -msgid "Photo storage failed." +#: ../../include/bbcode.php:134 ../../include/bbcode.php:912 +#: ../../include/bbcode.php:915 ../../include/bbcode.php:920 +#: ../../include/bbcode.php:923 ../../include/bbcode.php:926 +#: ../../include/bbcode.php:929 ../../include/bbcode.php:934 +#: ../../include/bbcode.php:937 ../../include/bbcode.php:942 +#: ../../include/bbcode.php:945 ../../include/bbcode.php:948 +#: ../../include/bbcode.php:951 +msgid "Image/photo" msgstr "" -#: ../../include/photos.php:300 -msgid "a new photo" +#: ../../include/bbcode.php:173 ../../include/bbcode.php:962 +msgid "Encrypted content" msgstr "" -#: ../../include/photos.php:304 +#: ../../include/bbcode.php:189 #, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: ../../include/photos.php:507 ../../include/conversation.php:1696 -msgid "Photo Albums" +msgid "Install %s element: " msgstr "" -#: ../../include/photos.php:511 -msgid "Upload New Photos" +#: ../../include/bbcode.php:193 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: ../../include/network.php:729 -msgid "view full size" +#: ../../include/bbcode.php:272 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/network.php:1962 -msgid "Administrator" +#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 +msgid "Click to open/close" msgstr "" -#: ../../include/network.php:1978 -msgid "No Subject" +#: ../../include/bbcode.php:357 +msgid "spoiler" msgstr "" -#: ../../include/network.php:2234 -msgid "OStatus" +#: ../../include/bbcode.php:641 ../../include/wiki.php:528 +msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/network.php:2235 -msgid "GNU-Social" +#: ../../include/bbcode.php:900 +msgid "$1 wrote:" msgstr "" -#: ../../include/network.php:2236 -msgid "RSS/Atom" +#: ../../include/message.php:20 +msgid "No recipient provided." msgstr "" -#: ../../include/network.php:2239 -msgid "Facebook" +#: ../../include/message.php:25 +msgid "[no subject]" msgstr "" -#: ../../include/network.php:2240 -msgid "Zot" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/network.php:2241 -msgid "LinkedIn" +#: ../../include/message.php:223 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/network.php:2242 -msgid "XMPP/IM" +#: ../../include/security.php:117 +msgid "guest:" msgstr "" -#: ../../include/network.php:2243 -msgid "MySpace" +#: ../../include/security.php:535 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" #: ../../include/features.php:58 @@ -11164,12 +10959,80 @@ msgid "" "channel" msgstr "" +#: ../../include/account.php:35 +msgid "Not a valid email address" +msgstr "" + +#: ../../include/account.php:37 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: ../../include/account.php:43 +msgid "Your email address is already registered at this site." +msgstr "" + +#: ../../include/account.php:75 +msgid "An invitation is required." +msgstr "" + +#: ../../include/account.php:79 +msgid "Invitation could not be verified." +msgstr "" + +#: ../../include/account.php:130 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:198 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:263 +#, php-format +msgid "Registration confirmation for %s" +msgstr "" + +#: ../../include/account.php:330 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: ../../include/account.php:352 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:358 ../../include/account.php:420 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:431 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:471 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/account.php:756 ../../include/account.php:758 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/account.php:764 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/account.php:769 +msgid "This action is not available under your subscription plan." +msgstr "" + #: ../../include/bookmarks.php:35 #, php-format msgid "%1$s's bookmarks" msgstr "" -#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1714 +#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1716 msgid "Logout" msgstr "" @@ -11205,7 +11068,7 @@ msgstr "" msgid "Your chatrooms" msgstr "" -#: ../../include/nav.php:105 ../../include/conversation.php:1736 +#: ../../include/nav.php:105 ../../include/conversation.php:1735 msgid "Bookmarks" msgstr "" @@ -11334,7 +11197,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:221 ../../include/widgets.php:1593 +#: ../../include/nav.php:221 ../../include/widgets.php:1655 msgid "Admin" msgstr "" @@ -11358,10 +11221,6 @@ msgstr "" msgid "New Page" msgstr "" -#: ../../include/wiki.php:525 ../../include/bbcode.php:632 -msgid "Different viewers will see this text differently" -msgstr "" - #: ../../include/contact_widgets.php:11 #, php-format msgid "%d invitation available" @@ -11402,9 +11261,9 @@ msgstr "" msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:91 ../../include/taxonomy.php:188 -#: ../../include/taxonomy.php:270 ../../include/widgets.php:46 -#: ../../include/widgets.php:465 +#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 +#: ../../include/widgets.php:465 ../../include/taxonomy.php:188 +#: ../../include/taxonomy.php:270 msgid "Categories" msgstr "" @@ -11419,17 +11278,17 @@ msgstr[1] "" msgid "show more" msgstr "" -#: ../../include/connections.php:95 -msgid "New window" +#: ../../include/import.php:30 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/import.php:90 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/connections.php:214 -#, php-format -msgid "User '%s' deleted" +#: ../../include/import.php:1354 +msgid "Unable to import element \"" msgstr "" #: ../../include/js_strings.php:5 @@ -11572,19 +11431,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:45 ../../include/text.php:1314 +#: ../../include/js_strings.php:45 ../../include/text.php:1307 msgid "January" msgstr "" -#: ../../include/js_strings.php:46 ../../include/text.php:1314 +#: ../../include/js_strings.php:46 ../../include/text.php:1307 msgid "February" msgstr "" -#: ../../include/js_strings.php:47 ../../include/text.php:1314 +#: ../../include/js_strings.php:47 ../../include/text.php:1307 msgid "March" msgstr "" -#: ../../include/js_strings.php:48 ../../include/text.php:1314 +#: ../../include/js_strings.php:48 ../../include/text.php:1307 msgid "April" msgstr "" @@ -11593,31 +11452,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:50 ../../include/text.php:1314 +#: ../../include/js_strings.php:50 ../../include/text.php:1307 msgid "June" msgstr "" -#: ../../include/js_strings.php:51 ../../include/text.php:1314 +#: ../../include/js_strings.php:51 ../../include/text.php:1307 msgid "July" msgstr "" -#: ../../include/js_strings.php:52 ../../include/text.php:1314 +#: ../../include/js_strings.php:52 ../../include/text.php:1307 msgid "August" msgstr "" -#: ../../include/js_strings.php:53 ../../include/text.php:1314 +#: ../../include/js_strings.php:53 ../../include/text.php:1307 msgid "September" msgstr "" -#: ../../include/js_strings.php:54 ../../include/text.php:1314 +#: ../../include/js_strings.php:54 ../../include/text.php:1307 msgid "October" msgstr "" -#: ../../include/js_strings.php:55 ../../include/text.php:1314 +#: ../../include/js_strings.php:55 ../../include/text.php:1307 msgid "November" msgstr "" -#: ../../include/js_strings.php:56 ../../include/text.php:1314 +#: ../../include/js_strings.php:56 ../../include/text.php:1307 msgid "December" msgstr "" @@ -11670,31 +11529,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1310 +#: ../../include/js_strings.php:69 ../../include/text.php:1303 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:70 ../../include/text.php:1310 +#: ../../include/js_strings.php:70 ../../include/text.php:1303 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:71 ../../include/text.php:1310 +#: ../../include/js_strings.php:71 ../../include/text.php:1303 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:72 ../../include/text.php:1310 +#: ../../include/js_strings.php:72 ../../include/text.php:1303 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:73 ../../include/text.php:1310 +#: ../../include/js_strings.php:73 ../../include/text.php:1303 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:74 ../../include/text.php:1310 +#: ../../include/js_strings.php:74 ../../include/text.php:1303 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:75 ../../include/text.php:1310 +#: ../../include/js_strings.php:75 ../../include/text.php:1303 msgid "Saturday" msgstr "" @@ -11751,32 +11610,20 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/follow.php:27 -msgid "Channel is blocked on this site." -msgstr "" - -#: ../../include/follow.php:32 -msgid "Channel location missing." -msgstr "" - -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." -msgstr "" - -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." +#: ../../include/oembed.php:312 +msgid " by " msgstr "" -#: ../../include/follow.php:147 ../../include/follow.php:183 -msgid "Protocol disabled." +#: ../../include/oembed.php:313 +msgid " on " msgstr "" -#: ../../include/follow.php:171 -msgid "Channel discovery failed." +#: ../../include/oembed.php:342 +msgid "Embedded content" msgstr "" -#: ../../include/follow.php:210 -msgid "Cannot connect to yourself." +#: ../../include/oembed.php:351 +msgid "Embedding disabled" msgstr "" #: ../../include/dir_fns.php:141 @@ -11795,554 +11642,549 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/attach.php:248 ../../include/attach.php:336 -msgid "Item was not found." +#: ../../include/selectors.php:30 +msgid "Frequently" msgstr "" -#: ../../include/attach.php:497 -msgid "No source file." +#: ../../include/selectors.php:31 +msgid "Hourly" msgstr "" -#: ../../include/attach.php:519 -msgid "Cannot locate file to replace" +#: ../../include/selectors.php:32 +msgid "Twice daily" msgstr "" -#: ../../include/attach.php:537 -msgid "Cannot locate file to revise/update" +#: ../../include/selectors.php:33 +msgid "Daily" msgstr "" -#: ../../include/attach.php:668 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/selectors.php:34 +msgid "Weekly" msgstr "" -#: ../../include/attach.php:682 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/selectors.php:35 +msgid "Monthly" msgstr "" -#: ../../include/attach.php:852 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/selectors.php:49 +msgid "Currently Male" msgstr "" -#: ../../include/attach.php:865 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/selectors.php:49 +msgid "Currently Female" msgstr "" -#: ../../include/attach.php:920 ../../include/attach.php:936 -msgid "Path not available." +#: ../../include/selectors.php:49 +msgid "Mostly Male" msgstr "" -#: ../../include/attach.php:982 ../../include/attach.php:1140 -msgid "Empty pathname" +#: ../../include/selectors.php:49 +msgid "Mostly Female" msgstr "" -#: ../../include/attach.php:1008 -msgid "duplicate filename or path" +#: ../../include/selectors.php:49 +msgid "Transgender" msgstr "" -#: ../../include/attach.php:1030 -msgid "Path not found." +#: ../../include/selectors.php:49 +msgid "Intersex" msgstr "" -#: ../../include/attach.php:1094 -msgid "mkdir failed." +#: ../../include/selectors.php:49 +msgid "Transsexual" msgstr "" -#: ../../include/attach.php:1098 -msgid "database storage failed." +#: ../../include/selectors.php:49 +msgid "Hermaphrodite" msgstr "" -#: ../../include/attach.php:1146 -msgid "Empty path" +#: ../../include/selectors.php:49 +msgid "Neuter" msgstr "" -#: ../../include/items.php:909 ../../include/items.php:954 -msgid "(Unknown)" +#: ../../include/selectors.php:49 +msgid "Non-specific" msgstr "" -#: ../../include/items.php:1152 -msgid "Visible to anybody on the internet." +#: ../../include/selectors.php:49 +msgid "Undecided" msgstr "" -#: ../../include/items.php:1154 -msgid "Visible to you only." +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Males" msgstr "" -#: ../../include/items.php:1156 -msgid "Visible to anybody in this network." +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Females" msgstr "" -#: ../../include/items.php:1158 -msgid "Visible to anybody authenticated." +#: ../../include/selectors.php:85 +msgid "Gay" msgstr "" -#: ../../include/items.php:1160 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/selectors.php:85 +msgid "Lesbian" msgstr "" -#: ../../include/items.php:1162 -msgid "Visible to all connections." +#: ../../include/selectors.php:85 +msgid "No Preference" msgstr "" -#: ../../include/items.php:1164 -msgid "Visible to approved connections." +#: ../../include/selectors.php:85 +msgid "Bisexual" msgstr "" -#: ../../include/items.php:1166 -msgid "Visible to specific connections." +#: ../../include/selectors.php:85 +msgid "Autosexual" msgstr "" -#: ../../include/items.php:3960 -msgid "Privacy group is empty." +#: ../../include/selectors.php:85 +msgid "Abstinent" msgstr "" -#: ../../include/items.php:3967 -#, php-format -msgid "Privacy group: %s" +#: ../../include/selectors.php:85 +msgid "Virgin" msgstr "" -#: ../../include/items.php:3979 -msgid "Connection not found." +#: ../../include/selectors.php:85 +msgid "Deviant" msgstr "" -#: ../../include/items.php:4332 -msgid "profile photo" +#: ../../include/selectors.php:85 +msgid "Fetish" msgstr "" -#: ../../include/items.php:4528 -#, php-format -msgid "[Edited %s]" +#: ../../include/selectors.php:85 +msgid "Oodles" msgstr "" -#: ../../include/items.php:4528 -msgctxt "edit_activity" -msgid "Post" +#: ../../include/selectors.php:85 +msgid "Nonsexual" msgstr "" -#: ../../include/items.php:4528 -msgctxt "edit_activity" -msgid "Comment" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Single" msgstr "" -#: ../../include/zot.php:705 -msgid "Invalid data packet" +#: ../../include/selectors.php:123 +msgid "Lonely" msgstr "" -#: ../../include/zot.php:721 -msgid "Unable to verify channel signature" +#: ../../include/selectors.php:123 +msgid "Available" msgstr "" -#: ../../include/zot.php:2336 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/selectors.php:123 +msgid "Unavailable" msgstr "" -#: ../../include/zot.php:3721 -msgid "invalid target signature" +#: ../../include/selectors.php:123 +msgid "Has crush" msgstr "" -#: ../../include/auth.php:148 -msgid "Logged out." +#: ../../include/selectors.php:123 +msgid "Infatuated" msgstr "" -#: ../../include/auth.php:275 -msgid "Failed authentication" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Dating" msgstr "" -#: ../../include/activities.php:41 -msgid " and " +#: ../../include/selectors.php:123 +msgid "Unfaithful" msgstr "" -#: ../../include/activities.php:49 -msgid "public profile" +#: ../../include/selectors.php:123 +msgid "Sex Addict" msgstr "" -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/selectors.php:123 +msgid "Friends/Benefits" msgstr "" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/selectors.php:123 +msgid "Casual" msgstr "" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/selectors.php:123 +msgid "Engaged" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Married" msgstr "" -#: ../../include/text.php:459 +#: ../../include/selectors.php:123 +msgid "Imaginarily married" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Partners" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Common law" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Happy" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Not looking" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Swinger" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Betrayed" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Unstable" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Uncertain" +msgstr "" + +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Don't care" +msgstr "" + +#: ../../include/selectors.php:123 +msgid "Ask me" +msgstr "" + +#: ../../include/text.php:460 msgid "prev" msgstr "" -#: ../../include/text.php:461 +#: ../../include/text.php:462 msgid "first" msgstr "" -#: ../../include/text.php:490 +#: ../../include/text.php:491 msgid "last" msgstr "" -#: ../../include/text.php:493 +#: ../../include/text.php:494 msgid "next" msgstr "" -#: ../../include/text.php:504 +#: ../../include/text.php:505 msgid "older" msgstr "" -#: ../../include/text.php:506 +#: ../../include/text.php:507 msgid "newer" msgstr "" -#: ../../include/text.php:911 +#: ../../include/text.php:904 msgid "No connections" msgstr "" -#: ../../include/text.php:936 +#: ../../include/text.php:929 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1081 ../../include/text.php:1086 +#: ../../include/text.php:1074 ../../include/text.php:1079 msgid "poke" msgstr "" -#: ../../include/text.php:1081 ../../include/text.php:1086 +#: ../../include/text.php:1074 ../../include/text.php:1079 #: ../../include/conversation.php:243 msgid "poked" msgstr "" -#: ../../include/text.php:1087 +#: ../../include/text.php:1080 msgid "ping" msgstr "" -#: ../../include/text.php:1087 +#: ../../include/text.php:1080 msgid "pinged" msgstr "" -#: ../../include/text.php:1088 +#: ../../include/text.php:1081 msgid "prod" msgstr "" -#: ../../include/text.php:1088 +#: ../../include/text.php:1081 msgid "prodded" msgstr "" -#: ../../include/text.php:1089 +#: ../../include/text.php:1082 msgid "slap" msgstr "" -#: ../../include/text.php:1089 +#: ../../include/text.php:1082 msgid "slapped" msgstr "" -#: ../../include/text.php:1090 +#: ../../include/text.php:1083 msgid "finger" msgstr "" -#: ../../include/text.php:1090 +#: ../../include/text.php:1083 msgid "fingered" msgstr "" -#: ../../include/text.php:1091 +#: ../../include/text.php:1084 msgid "rebuff" msgstr "" -#: ../../include/text.php:1091 +#: ../../include/text.php:1084 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1103 +#: ../../include/text.php:1096 msgid "happy" msgstr "" -#: ../../include/text.php:1104 +#: ../../include/text.php:1097 msgid "sad" msgstr "" -#: ../../include/text.php:1105 +#: ../../include/text.php:1098 msgid "mellow" msgstr "" -#: ../../include/text.php:1106 +#: ../../include/text.php:1099 msgid "tired" msgstr "" -#: ../../include/text.php:1107 +#: ../../include/text.php:1100 msgid "perky" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1101 msgid "angry" msgstr "" -#: ../../include/text.php:1109 +#: ../../include/text.php:1102 msgid "stupefied" msgstr "" -#: ../../include/text.php:1110 +#: ../../include/text.php:1103 msgid "puzzled" msgstr "" -#: ../../include/text.php:1111 +#: ../../include/text.php:1104 msgid "interested" msgstr "" -#: ../../include/text.php:1112 +#: ../../include/text.php:1105 msgid "bitter" msgstr "" -#: ../../include/text.php:1113 +#: ../../include/text.php:1106 msgid "cheerful" msgstr "" -#: ../../include/text.php:1114 +#: ../../include/text.php:1107 msgid "alive" msgstr "" -#: ../../include/text.php:1115 +#: ../../include/text.php:1108 msgid "annoyed" msgstr "" -#: ../../include/text.php:1116 +#: ../../include/text.php:1109 msgid "anxious" msgstr "" -#: ../../include/text.php:1117 +#: ../../include/text.php:1110 msgid "cranky" msgstr "" -#: ../../include/text.php:1118 +#: ../../include/text.php:1111 msgid "disturbed" msgstr "" -#: ../../include/text.php:1119 +#: ../../include/text.php:1112 msgid "frustrated" msgstr "" -#: ../../include/text.php:1120 +#: ../../include/text.php:1113 msgid "depressed" msgstr "" -#: ../../include/text.php:1121 +#: ../../include/text.php:1114 msgid "motivated" msgstr "" -#: ../../include/text.php:1122 +#: ../../include/text.php:1115 msgid "relaxed" msgstr "" -#: ../../include/text.php:1123 +#: ../../include/text.php:1116 msgid "surprised" msgstr "" -#: ../../include/text.php:1314 +#: ../../include/text.php:1307 msgid "May" msgstr "" -#: ../../include/text.php:1391 ../../include/text.php:1395 +#: ../../include/text.php:1384 ../../include/text.php:1388 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1397 +#: ../../include/text.php:1390 msgid "unknown" msgstr "" -#: ../../include/text.php:1433 +#: ../../include/text.php:1426 msgid "remove category" msgstr "" -#: ../../include/text.php:1510 +#: ../../include/text.php:1503 msgid "remove from file" msgstr "" -#: ../../include/text.php:1814 ../../include/language.php:367 +#: ../../include/text.php:1770 ../../include/language.php:367 msgid "default" msgstr "" -#: ../../include/text.php:1822 +#: ../../include/text.php:1778 msgid "Page layout" msgstr "" -#: ../../include/text.php:1822 +#: ../../include/text.php:1778 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1864 +#: ../../include/text.php:1820 msgid "Page content type" msgstr "" -#: ../../include/text.php:1997 +#: ../../include/text.php:1953 msgid "activity" msgstr "" -#: ../../include/text.php:2308 +#: ../../include/text.php:2264 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2314 +#: ../../include/text.php:2270 msgid "Pages" msgstr "" -#: ../../include/text.php:2336 +#: ../../include/text.php:2292 msgid "Import website..." msgstr "" -#: ../../include/text.php:2337 +#: ../../include/text.php:2293 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2338 +#: ../../include/text.php:2294 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2339 +#: ../../include/text.php:2295 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2340 +#: ../../include/text.php:2296 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2341 +#: ../../include/text.php:2297 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2342 +#: ../../include/text.php:2298 msgid "Select folder" msgstr "" -#: ../../include/text.php:2343 +#: ../../include/text.php:2299 msgid "Export website..." msgstr "" -#: ../../include/text.php:2344 +#: ../../include/text.php:2300 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2345 +#: ../../include/text.php:2301 msgid "website.zip" msgstr "" -#: ../../include/text.php:2346 +#: ../../include/text.php:2302 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2347 +#: ../../include/text.php:2303 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2348 +#: ../../include/text.php:2304 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2349 +#: ../../include/text.php:2305 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2350 +#: ../../include/text.php:2306 msgid "Specify folder" msgstr "" -#: ../../include/bb2diaspora.php:401 -msgid "Attachments:" -msgstr "" - -#: ../../include/bb2diaspora.php:492 -msgid "$Projectname event notification:" -msgstr "" - -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "" - -#: ../../include/group.php:248 -msgid "Add new connections to this privacy group" -msgstr "" - -#: ../../include/group.php:289 -msgid "edit" -msgstr "" - -#: ../../include/group.php:312 -msgid "Edit group" -msgstr "" - -#: ../../include/group.php:313 -msgid "Add privacy group" -msgstr "" - -#: ../../include/group.php:314 -msgid "Channels not in any privacy group" -msgstr "" - -#: ../../include/group.php:316 ../../include/widgets.php:284 -msgid "add" -msgstr "" - -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" -msgstr "" - -#: ../../include/taxonomy.php:293 -msgid "Keywords" -msgstr "" - -#: ../../include/taxonomy.php:314 -msgid "have" -msgstr "" - -#: ../../include/taxonomy.php:314 -msgid "has" -msgstr "" - -#: ../../include/taxonomy.php:315 -msgid "want" -msgstr "" - -#: ../../include/taxonomy.php:315 -msgid "wants" -msgstr "" - -#: ../../include/taxonomy.php:316 -msgid "likes" -msgstr "" - -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/auth.php:148 +msgid "Logged out." msgstr "" -#: ../../include/oembed.php:312 -msgid " by " +#: ../../include/auth.php:275 +msgid "Failed authentication" msgstr "" -#: ../../include/oembed.php:313 -msgid " on " +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/oembed.php:342 -msgid "Embedded content" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/oembed.php:351 -msgid "Embedding disabled" +#: ../../include/activities.php:58 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/security.php:117 -msgid "guest:" +#: ../../include/activities.php:59 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/security.php:535 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: ../../include/activities.php:62 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" #: ../../include/widgets.php:103 @@ -12386,6 +12228,10 @@ msgstr "" msgid "Remove term" msgstr "" +#: ../../include/widgets.php:284 ../../include/group.php:316 +msgid "add" +msgstr "" + #: ../../include/widgets.php:390 msgid "Archives" msgstr "" @@ -12470,8 +12316,8 @@ msgstr "" msgid "Import Calendar" msgstr "" -#: ../../include/widgets.php:883 ../../include/conversation.php:1723 -#: ../../include/conversation.php:1726 +#: ../../include/widgets.php:883 ../../include/conversation.php:1722 +#: ../../include/conversation.php:1725 msgid "Chatrooms" msgstr "" @@ -12483,70 +12329,407 @@ msgstr "" msgid "Chat Members" msgstr "" -#: ../../include/widgets.php:916 +#: ../../include/widgets.php:960 msgid "Wiki List" msgstr "" -#: ../../include/widgets.php:954 +#: ../../include/widgets.php:966 +msgid "Download" +msgstr "" + +#: ../../include/widgets.php:968 +msgid "Create new wiki" +msgstr "" + +#: ../../include/widgets.php:970 +msgid "Wiki name" +msgstr "" + +#: ../../include/widgets.php:978 +msgid "Send notification" +msgstr "" + +#: ../../include/widgets.php:1014 msgid "Wiki Pages" msgstr "" -#: ../../include/widgets.php:989 +#: ../../include/widgets.php:1019 +msgid "Add new page" +msgstr "" + +#: ../../include/widgets.php:1051 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:1020 +#: ../../include/widgets.php:1082 msgid "Suggested Chatrooms" msgstr "" -#: ../../include/widgets.php:1165 ../../include/widgets.php:1277 +#: ../../include/widgets.php:1227 ../../include/widgets.php:1339 msgid "photo/image" msgstr "" -#: ../../include/widgets.php:1220 +#: ../../include/widgets.php:1282 msgid "Click to show more" msgstr "" -#: ../../include/widgets.php:1371 +#: ../../include/widgets.php:1433 msgid "Rating Tools" msgstr "" -#: ../../include/widgets.php:1375 ../../include/widgets.php:1377 +#: ../../include/widgets.php:1437 ../../include/widgets.php:1439 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:1380 +#: ../../include/widgets.php:1442 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:1464 +#: ../../include/widgets.php:1526 msgid "Forums" msgstr "" -#: ../../include/widgets.php:1493 +#: ../../include/widgets.php:1555 msgid "Tasks" msgstr "" -#: ../../include/widgets.php:1504 +#: ../../include/widgets.php:1566 msgid "Documentation" msgstr "" -#: ../../include/widgets.php:1560 ../../include/widgets.php:1598 +#: ../../include/widgets.php:1622 ../../include/widgets.php:1660 msgid "Member registrations waiting for confirmation" msgstr "" -#: ../../include/widgets.php:1566 +#: ../../include/widgets.php:1628 msgid "Inspect queue" msgstr "" -#: ../../include/widgets.php:1568 +#: ../../include/widgets.php:1630 msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1594 +#: ../../include/widgets.php:1656 msgid "Plugin Features" msgstr "" +#: ../../include/zot.php:705 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:721 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:2336 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/zot.php:3721 +msgid "invalid target signature" +msgstr "" + +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" +msgstr "" + +#: ../../include/taxonomy.php:293 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:314 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:315 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:316 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:317 +msgid "dislikes" +msgstr "" + +#: ../../include/bb2diaspora.php:401 +msgid "Attachments:" +msgstr "" + +#: ../../include/bb2diaspora.php:490 ../../include/event.php:22 +#: ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/bb2diaspora.php:492 +msgid "$Projectname event notification:" +msgstr "" + +#: ../../include/bb2diaspora.php:496 ../../include/event.php:30 +#: ../../include/event.php:73 +msgid "Starts:" +msgstr "" + +#: ../../include/bb2diaspora.php:504 ../../include/event.php:40 +#: ../../include/event.php:77 +msgid "Finishes:" +msgstr "" + +#: ../../include/follow.php:27 +msgid "Channel is blocked on this site." +msgstr "" + +#: ../../include/follow.php:32 +msgid "Channel location missing." +msgstr "" + +#: ../../include/follow.php:80 +msgid "Response from remote channel was incomplete." +msgstr "" + +#: ../../include/follow.php:97 +msgid "Channel was deleted and no longer exists." +msgstr "" + +#: ../../include/follow.php:147 ../../include/follow.php:183 +msgid "Protocol disabled." +msgstr "" + +#: ../../include/follow.php:171 +msgid "Channel discovery failed." +msgstr "" + +#: ../../include/follow.php:210 +msgid "Cannot connect to yourself." +msgstr "" + +#: ../../include/help.php:31 +msgid "Help:" +msgstr "" + +#: ../../include/items.php:837 ../../include/items.php:882 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1080 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1082 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1084 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1086 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1088 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1090 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1092 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1094 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3888 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3895 +#, php-format +msgid "Privacy group: %s" +msgstr "" + +#: ../../include/items.php:3907 +msgid "Connection not found." +msgstr "" + +#: ../../include/items.php:4260 +msgid "profile photo" +msgstr "" + +#: ../../include/items.php:4456 +#, php-format +msgid "[Edited %s]" +msgstr "" + +#: ../../include/items.php:4456 +msgctxt "edit_activity" +msgid "Post" +msgstr "" + +#: ../../include/items.php:4456 +msgctxt "edit_activity" +msgid "Comment" +msgstr "" + +#: ../../include/network.php:729 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1962 +msgid "Administrator" +msgstr "" + +#: ../../include/network.php:1978 +msgid "No Subject" +msgstr "" + +#: ../../include/network.php:2234 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:2235 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:2236 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:2239 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:2240 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:2241 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:2242 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:2243 +msgid "MySpace" +msgstr "" + +#: ../../include/photos.php:115 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:122 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:260 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:300 +msgid "a new photo" +msgstr "" + +#: ../../include/photos.php:304 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "" + +#: ../../include/photos.php:507 ../../include/conversation.php:1695 +msgid "Photo Albums" +msgstr "" + +#: ../../include/photos.php:511 +msgid "Upload New Photos" +msgstr "" + +#: ../../include/language.php:380 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/permissions.php:35 +msgid "Can view my normal stream and posts" +msgstr "" + +#: ../../include/permissions.php:39 +msgid "Can view my webpages" +msgstr "" + +#: ../../include/permissions.php:43 +msgid "Can post on my channel page (\"wall\")" +msgstr "" + +#: ../../include/permissions.php:46 +msgid "Can like/dislike stuff" +msgstr "" + +#: ../../include/permissions.php:46 +msgid "Profiles and things other than posts/comments" +msgstr "" + +#: ../../include/permissions.php:48 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "" + +#: ../../include/permissions.php:48 +msgid "Advanced - useful for creating group forum channels" +msgstr "" + +#: ../../include/permissions.php:49 +msgid "Can chat with me (when available)" +msgstr "" + +#: ../../include/permissions.php:50 +msgid "Can write to my file storage and photos" +msgstr "" + +#: ../../include/permissions.php:51 +msgid "Can edit my webpages" +msgstr "" + +#: ../../include/permissions.php:53 +msgid "Somewhat advanced - very useful in open communities" +msgstr "" + +#: ../../include/permissions.php:55 +msgid "Can administer my channel resources" +msgstr "" + +#: ../../include/permissions.php:55 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "" + +#: ../../include/connections.php:95 +msgid "New window" +msgstr "" + +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" +msgstr "" + +#: ../../include/connections.php:214 +#, php-format +msgid "User '%s' deleted" +msgstr "" + #: ../../include/conversation.php:204 #, php-format msgid "%1$s is now connected with %2$s" @@ -12755,192 +12938,72 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1675 +#: ../../include/conversation.php:1674 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1684 +#: ../../include/conversation.php:1683 msgid "About" msgstr "" -#: ../../include/conversation.php:1687 +#: ../../include/conversation.php:1686 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1703 +#: ../../include/conversation.php:1702 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1739 +#: ../../include/conversation.php:1738 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1749 +#: ../../include/conversation.php:1748 msgid "Manage Webpages" msgstr "" -#: ../../include/conversation.php:1814 +#: ../../include/conversation.php:1813 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1817 +#: ../../include/conversation.php:1816 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1820 +#: ../../include/conversation.php:1819 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1823 +#: ../../include/conversation.php:1822 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1826 +#: ../../include/conversation.php:1825 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1829 +#: ../../include/conversation.php:1828 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/permissions.php:35 -msgid "Can view my normal stream and posts" -msgstr "" - -#: ../../include/permissions.php:39 -msgid "Can view my webpages" -msgstr "" - -#: ../../include/permissions.php:43 -msgid "Can post on my channel page (\"wall\")" -msgstr "" - -#: ../../include/permissions.php:46 -msgid "Can like/dislike stuff" -msgstr "" - -#: ../../include/permissions.php:46 -msgid "Profiles and things other than posts/comments" -msgstr "" - -#: ../../include/permissions.php:48 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "" - -#: ../../include/permissions.php:48 -msgid "Advanced - useful for creating group forum channels" -msgstr "" - -#: ../../include/permissions.php:49 -msgid "Can chat with me (when available)" -msgstr "" - -#: ../../include/permissions.php:50 -msgid "Can write to my file storage and photos" -msgstr "" - -#: ../../include/permissions.php:51 -msgid "Can edit my webpages" -msgstr "" - -#: ../../include/permissions.php:53 -msgid "Somewhat advanced - very useful in open communities" -msgstr "" - -#: ../../include/permissions.php:55 -msgid "Can administer my channel resources" -msgstr "" - -#: ../../include/permissions.php:55 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "" - -#: ../../include/account.php:35 -msgid "Not a valid email address" -msgstr "" - -#: ../../include/account.php:37 -msgid "Your email domain is not among those allowed on this site" -msgstr "" - -#: ../../include/account.php:43 -msgid "Your email address is already registered at this site." -msgstr "" - -#: ../../include/account.php:75 -msgid "An invitation is required." -msgstr "" - -#: ../../include/account.php:79 -msgid "Invitation could not be verified." -msgstr "" - -#: ../../include/account.php:130 -msgid "Please enter the required information." -msgstr "" - -#: ../../include/account.php:198 -msgid "Failed to store account information." -msgstr "" - -#: ../../include/account.php:263 -#, php-format -msgid "Registration confirmation for %s" -msgstr "" - -#: ../../include/account.php:330 -#, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../include/account.php:352 -msgid "your registration password" -msgstr "" - -#: ../../include/account.php:358 ../../include/account.php:420 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../include/account.php:431 -msgid "Account approved." -msgstr "" - -#: ../../include/account.php:471 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../include/account.php:756 ../../include/account.php:758 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/account.php:764 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/account.php:769 -msgid "This action is not available under your subscription plan." -msgstr "" - #: ../../include/datetime.php:147 msgid "Birthday" msgstr "" @@ -12953,7 +13016,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:286 ../../boot.php:2554 +#: ../../include/datetime.php:286 ../../boot.php:2548 msgid "never" msgstr "" @@ -13026,64 +13089,55 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/language.php:380 -msgid "Select an alternate language" +#: ../../include/event.php:824 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/event.php:1024 +msgid "Not specified" msgstr "" -#: ../../include/import.php:90 -msgid "Channel clone failed. Import failed." +#: ../../include/event.php:1025 +msgid "Needs Action" msgstr "" -#: ../../include/import.php:1354 -msgid "Unable to import element \"" +#: ../../include/event.php:1026 +msgid "Completed" msgstr "" -#: ../../include/bbcode.php:134 ../../include/bbcode.php:901 -#: ../../include/bbcode.php:904 ../../include/bbcode.php:909 -#: ../../include/bbcode.php:912 ../../include/bbcode.php:915 -#: ../../include/bbcode.php:918 ../../include/bbcode.php:923 -#: ../../include/bbcode.php:926 ../../include/bbcode.php:931 -#: ../../include/bbcode.php:934 ../../include/bbcode.php:937 -#: ../../include/bbcode.php:940 -msgid "Image/photo" +#: ../../include/event.php:1027 +msgid "In Process" msgstr "" -#: ../../include/bbcode.php:173 ../../include/bbcode.php:951 -msgid "Encrypted content" +#: ../../include/event.php:1028 +msgid "Cancelled" msgstr "" -#: ../../include/bbcode.php:189 -#, php-format -msgid "Install %s element: " +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../include/bbcode.php:193 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." +#: ../../include/group.php:248 +msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/bbcode.php:272 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/group.php:289 +msgid "edit" msgstr "" -#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 -msgid "Click to open/close" +#: ../../include/group.php:312 +msgid "Edit group" msgstr "" -#: ../../include/bbcode.php:357 -msgid "spoiler" +#: ../../include/group.php:313 +msgid "Add privacy group" msgstr "" -#: ../../include/bbcode.php:889 -msgid "$1 wrote:" +#: ../../include/group.php:314 +msgid "Channels not in any privacy group" msgstr "" #: ../../view/theme/redbasic/php/config.php:9 @@ -13218,66 +13272,66 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1171 +#: ../../boot.php:1173 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../boot.php:1171 +#: ../../boot.php:1173 msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../boot.php:1489 +#: ../../boot.php:1491 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1492 +#: ../../boot.php:1494 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1696 +#: ../../boot.php:1698 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1717 +#: ../../boot.php:1719 msgid "Login/Email" msgstr "" -#: ../../boot.php:1718 +#: ../../boot.php:1720 msgid "Password" msgstr "" -#: ../../boot.php:1719 +#: ../../boot.php:1721 msgid "Remember me" msgstr "" -#: ../../boot.php:1722 +#: ../../boot.php:1724 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2291 +#: ../../boot.php:2285 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2446 +#: ../../boot.php:2440 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2449 +#: ../../boot.php:2443 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2553 +#: ../../boot.php:2547 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2557 +#: ../../boot.php:2551 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f71fe8ea8..bd0e372f8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2037,5 +2037,5 @@ dl.bb-dl > dd > li { .sub-menu { margin-top: 10px; padding-left: 15px; - border-left: 3px solid #ccc; + border-left: 3px solid #eee; } diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 4eefb3189..cf076c244 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -11,7 +11,12 @@ transition: opacity 0.5s 0.5s ease; } </style> -<div class="generic-content-wrapper"> +{{if $hideEditor}} +<div> + <p class="lead text-center">{{$chooseWikiMessage}}</p> +</div> +{{/if}} +<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <div class="section-title-wrapper"> <div class="pull-right"> @@ -40,21 +45,13 @@ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> - <h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2> + <h2><span id="wiki-header-name"><i class="fa fa-book"></i> <b>{{$wikiheaderName}}</b></span> :  + <span id="wiki-header-page">{{$wikiheaderPage}}</span> + </h2> <div class="clear"></div> </div> - <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> - <form id="new-page-form" action="wiki/create/page" method="post" > - <div class="clear"></div> - {{include file="field_input.tpl" field=$pageName}} - <div class="btn-group pull-right"> - <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button> - </div> - </form> <div class="clear"></div> - <hr> - </div> <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <form id="rename-page-form" action="wiki/rename/page" method="post" > @@ -68,17 +65,34 @@ </div> <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> + <ul class="nav nav-tabs" id="wiki-nav-tabs"> - <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">Edit</a></li> - <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li> + <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> + <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> <li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> - + </ul> - + <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane fade"> <div id="ace-editor"></div> + {{if $showCommitMsg}} + {{if $showPageControls}} + <div class="section-content-wrapper"> + <div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'> + <label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label> + <span> + <input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> + <a id="save-page" href="#" class="btn btn-primary btn-md">Save</a> + </span> + <span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span> + + <div class="clear"></div> + </div> + </div> + {{/if}} + {{/if}} </div> <div id="preview-pane" class="tab-pane fade in active"> <div id="wiki-preview" class="section-content-wrapper"> @@ -88,27 +102,13 @@ <div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}> <div id="page-history-list" class="section-content-wrapper"> </div> - </div> + </div> + + </div> </div> </div> - {{if $showCommitMsg}} - {{if $showPageControls}} - <div class="section-content-wrapper"> - <div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'> - <label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label> - <span> - <input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> - <a id="save-page" href="#" class="btn btn-primary btn-md">Save</a> - </span> - <span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span> - - <div class="clear"></div> - </div> - </div> - {{/if}} - {{/if}} </div> {{$wikiModal}} @@ -192,7 +192,9 @@ editor.getSession().setValue(window.wiki_page_content); window.editor = editor; // Store the editor in the window object so the anonymous function can use it. - + {{if !$showPageControls}} + editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission + {{/if}} $('#edit-pane-tab').click(function (ev) { setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry }); @@ -241,23 +243,6 @@ window.location = "wiki/{{$channel}}/download/wiki/" + resource_id; } - $('#new-page-submit').click(function (ev) { - if (window.wiki_resource_id === '') { - window.console.log('You must have a wiki open in order to create pages.'); - ev.preventDefault(); - return false; - } - $.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, - function (data) { - if (data.success) { - window.location = data.url; - } else { - window.console.log('Error creating page.'); - } - }, 'json'); - ev.preventDefault(); - }); - function wiki_refresh_page_list() { if (window.wiki_resource_id === '') { return false; @@ -482,6 +467,7 @@ }; function wiki_show_new_wiki_form() { + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#new-page-form-wrapper').hide(); $('#edit-wiki-form-wrapper').hide(); $('#new-wiki-form-wrapper').toggle(); @@ -489,6 +475,7 @@ } function wiki_show_new_page_form() { + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#edit-wiki-form-wrapper').hide(); $('#new-wiki-form-wrapper').hide(); $('#new-page-form-wrapper').toggle(); @@ -498,6 +485,7 @@ function wiki_show_edit_wiki_form(wiki_title, wiki_resource_id) { window.wiki_resource_id = wiki_resource_id; window.wiki_title = wiki_title; + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#new-page-form-wrapper').hide(); $('#new-wiki-form-wrapper').hide(); $('#edit-wiki-form-wrapper').toggle(); @@ -514,5 +502,6 @@ {{else}} $('#new-wiki-button').hide(); {{/if}} + }); </script> diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index c020f2520..c0eeecff8 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -10,5 +10,38 @@ {{/if}} {{if $canadd}}<li><a href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i> {{$addnew}}</a></li>{{/if}} </ul> + {{if $canadd}} + <div id="new-page-form-wrapper" class="sub-menu" style="display:none;"> + <form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" > + <div class="clear"></div> + {{include file="field_input.tpl" field=$pageName}} + <div class="btn-group pull-right"> + <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button> + </div> + </form> + <div class="clear"></div> + <hr> + </div> + {{/if}} </div> {{if $not_refresh}}</div>{{/if}} + +<script> + + $('#new-page-submit').click(function (ev) { + if (window.wiki_resource_id === '') { + window.console.log('You must have a wiki open in order to create pages.'); + ev.preventDefault(); + return false; + } + $.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, + function (data) { + if (data.success) { + window.location = data.url; + } else { + window.console.log('Error creating page.'); + } + }, 'json'); + ev.preventDefault(); + }); +</script>
\ No newline at end of file diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index d3c6b867f..51eccad90 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -21,18 +21,14 @@ {{/foreach}} {{/if}} {{if $owner}} - <li><a href="#" class="fakelink" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); openClose('new-wiki-form-wrapper'); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i> {{$addnew}}</a></li> + <li><a href="#" class="fakelink" onclick="wiki_show_new_wiki_form(); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i> {{$addnew}}</a></li> {{/if}} </ul> {{if $owner}} <div id="new-wiki-form-wrapper" class="sub-menu" style="display:none;"> <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$wikiName}} - <div id="post-visible-container" class="checkbox"> - <label> - <input name="postVisible" id="postVisible" value="0" type="checkbox">{{$notify}} - </label> - </div> + {{include file="field_checkbox.tpl" field=$notify}} <div> <div id="profile-jot-submit-right" class="btn-group"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> |